fixed doctrine mappings

Author: hauptmedia

app/config.yml

@@ -20,4 +20,4 @@ doctrine:
                 type: yml
                 is_bundle: false
                 prefix: PHPCommerce\Payment\Entity
-                dir: %kernel.root_dir%/../src/PHPCommerce/Bundle/Resources/config/doctrine
+                dir: %kernel.root_dir%/../src/PHPCommerce/Payment/Resources/config/doctrine

src/PHPCommerce/CoreBundle/Resources/config/doctrine/Order.orm.yml renamed to src/PHPCommerce/Bundle/Resources/config/doctrine/PHPCommerce.ERP.Entity.Order.orm.yml

@@ -1,4 +1,4 @@
-PHPCommerce\Entity\Order:
+PHPCommerce\ERP\Entity\Order:
   type: entity
   table: order
 

src/PHPCommerce/Entity/Order.php renamed to src/PHPCommerce/ERP/Entity/Order.php

@@ -1,5 +1,5 @@
 <?php
-namespace PHPCommerce\Entity;
+namespace PHPCommerce\ERP\Entity;
 
 class Order {
     protected $id;

src/PHPCommerce/Entity/OrderPayment.php renamed to src/PHPCommerce/Payment/Entity/OrderPayment.php

@@ -1,5 +1,5 @@
 <?php
-namespace PHPCommerce\Entity;
+namespace PHPCommerce\Payment\Entity;
 
 /**
  * <p>This entity is designed to deal with payments associated to an {@link Order} and is <i>usually</i> unique for a particular
@@ -23,7 +23,7 @@
 class OrderPayment /*extends Serializable, Status*/ {
     protected $id;
 
-    protected $order;
+    //protected $order;
 
     public function getId()
     {
@@ -38,107 +38,107 @@ public function setId($id)
     /**
      * @return Order
      */
-    public function getOrder()
+  /*  public function getOrder()
     {
         return $this->order;
     }
-
+*/
     /**
      * @param Order $order
      * @return mixed
      */
-    public function setOrder(Order $order)
+  /*  public function setOrder(Order $order)
     {
         $this->order = $order;
     }
-
+*/
     /**
      * Gets the billing address associated with this payment. This might be null for some payments where no billing address
      * is required (like gift cards or account credit)
      * @return Address
      */
-    public function getBillingAddress()
+ /*   public function getBillingAddress()
     {
 
-    }
+    }*/
 
     /**
      * Sets the billing address associated with this payment. This might be null for some payments where no billing address
      * is required (like gift cards or account credit)
      */
-    public function setBillingAddress(Address $billingAddress)
+  /*  public function setBillingAddress(Address $billingAddress)
     {
 
-    }
+    }*/
 
     /**
      * The amount that this payment is allotted for. The summation of all of the {@link OrderPayment}s for a particular
      * {@link Order} should equal {@link Order#getTotal()}
      * @return Money
      */
-    public function getAmount()
+    /*public function getAmount()
     {
 
-    }
+    }*/
 
     /**
      * The amount that this payment is allotted for. The summation of all of the {@link OrderPayment}s for a particular
      * {@link Order} should equal {@link Order#getTotal()}
      */
-    public function setAmount(Money $amount)
+  /*  public function setAmount(Money $amount)
     {
 
-    }
+    }*/
 
     /**
      * The soft link to a {@link Referenced} entity which will be stored in the blSecurePU persistence unit. If you are not
      * attempting to store credit cards in your own database (which is the usual, recommended case) then this will not be
      * used or set. If you do use this reference number, this can be anything that is unique (like System.currentTimeMillis()).
      */
-    public function getReferenceNumber()
+    /*public function getReferenceNumber()
     {
 
-    }
+    }*/
 
     /**
      * Sets the soft link to a {@link Referenced} entity stored in the blSecurePU persistence unit. This will likely not
      * be used as the common case is to not store credit cards yourself.
      */
-    public function setReferenceNumber($referenceNumber)
+    /*public function setReferenceNumber($referenceNumber)
     {
 
-    }
+    }*/
 
     /**
      * The type of this payment like Credit Card or Gift Card.
      *
      * @see {@link PaymentType}
      * @return PaymentType
      */
-    public function getType()
+   /* public function getType()
     {
 
-    }
+    }*/
 
     /**
      * Sets the type of this payment like Credit Card or Gift Card
      *
      * @see {@link PaymentType}
      */
-    public function setType(PaymentType $type)
+    /*public function setType(PaymentType $type)
     {
 
-    }
+    }*/
 
     /**
      * Gets the gateway that was used to process this order payment. Only a SINGLE payment gateway can modify transactions
      * on a particular order payment.
      * @return PaymentGatewayType
      */
-    public function getGatewayType()
+    /*public function getGatewayType()
     {
 
-    }
+    }*/
 
     /**
      * <p>Gets the gateway that was used to process this order payment. Only a SINGLE payment gateway can modify transactions
@@ -147,10 +147,10 @@ public function getGatewayType()
      * <p>It usually does not make sense to modify the gateway type after it has already been set once. Instead, consider
      * just archiving this payment type (by deleting it) and creating a new payment for the new gateway.</p>
      */
-    public function setPaymentGatewayType(PaymentGatewayType $gatewayType)
+   /* public function setPaymentGatewayType(PaymentGatewayType $gatewayType)
     {
 
-    }
+    }*/
 
     /**
      * <p>All of the transactions that have been applied to this particular payment. Transactions are denoted by the various
@@ -162,10 +162,10 @@ public function setPaymentGatewayType(PaymentGatewayType $gatewayType)
      * @see {@link #addTransaction(PaymentTransaction)}
      * @return PaymentTransaction[]
      */
-    public function getTransactions()
+ /*   public function getTransactions()
     {
 
-    }
+    }*/
 
     /**
      * <p>All of the transactions that have been applied to this particular payment. Transactions are denoted by the various
@@ -177,19 +177,19 @@ public function getTransactions()
      * @see {@link #addTransaction(PaymentTransaction)}
      * @param PaymentTransaction
      */
-    public function setTransactions($details)
+   /* public function setTransactions($details)
     {
 
-    }
+    }*/
 
     /**
      * A more declarative way to invoke {@link #getTransactions().add()}. This is the preferred way to add a transaction
      * to this payment.
      */
-    public function addTransaction(PaymentTransaction $transaction)
+   /* public function addTransaction(PaymentTransaction $transaction)
     {
 
-    }
+    }*/
 
     /**
      * Returns a transaction for given <b>type</b>. This is useful when validating whether or not a {@link PaymentTransaction}
@@ -201,10 +201,10 @@ public function addTransaction(PaymentTransaction $transaction)
      *
      * @return PaymentTransaction[]
      */
-    public function getTransactionsForType(PaymentTransactionType $type)
+    /*public function getTransactionsForType(PaymentTransactionType $type)
     {
 
-    }
+    }*/
 
     /**
      * Returns the initial transaction for this order payment. This would either be an {@link PaymentTransactionType#AUTHORIZE}
@@ -214,10 +214,10 @@ public function getTransactionsForType(PaymentTransactionType $type)
      *
      * @return PaymentTransaction the initial transaction for this order payment or null if there isn't any
      */
-    public function getInitialTransaction()
+    /*public function getInitialTransaction()
     {
 
-    }
+    }*/
 
     /**
      * Looks through all of the transactions for this payment and adds up the amount for the given transaction type. This
@@ -227,21 +227,21 @@ public function getInitialTransaction()
      * @return the amount of all of the transactions for the given type
      * @see {@link #getSuccessfulTransactionAmountForType(PaymentTransactionType)}
      */
-    public function getTransactionAmountForType(PaymentTransactionType $type)
+    /*public function getTransactionAmountForType(PaymentTransactionType $type)
     {
 
-    }
+    }*/
 
     /**
      * Returns all of the transactions on this payment that were successful for the given type.
      *
      * @param type the type of transaction
      * @return the amount of all of the transaction on this payment for the given type that have been successful
      */
-    public function getSuccessfulTransactionAmountForType(PaymentTransactionType $type)
+/*    public function getSuccessfulTransactionAmountForType(PaymentTransactionType $type)
     {
 
-    }
+    }*/
 
     /**
      * Looks through all of the transactions for this payment and returns whether or not
@@ -250,10 +250,10 @@ public function getSuccessfulTransactionAmountForType(PaymentTransactionType $ty
      *
      * @return
      */
-    public function isConfirmed()
+    /*public function isConfirmed()
     {
 
-    }
+    }*/
 
     /**
      * Returns whether or not this payment is considered to be the final payment on the order.
@@ -266,18 +266,18 @@ public function isConfirmed()
      *
      * @return bool
      */
-    public function isFinalPayment()
+    /*public function isFinalPayment()
     {
 
-    }
+    }*/
 
     /**
      * The currency that this payment should be taken in. This is a delegate to {@link #getOrder()#getCurrency()}.
      * @return BroadleafCurrency
      */
-    public function getCurrency()
+    /*public function getCurrency()
     {
 
-    }
+    }*/
 
 }

src/PHPCommerce/Entity/PaymentTransaction.php renamed to src/PHPCommerce/Payment/Entity/PaymentTransaction.php

@@ -1,5 +1,5 @@
 <?php
-namespace PHPCommerce\Entity;
+namespace PHPCommerce\Payment\Entity;
 
 class PaymentTransaction /* extends Serializable, Status, AdditionalFields */ {
     /**

src/PHPCommerce/Entity/Secure/BankAccountPayment.php renamed to src/PHPCommerce/Payment/Entity/Secure/BankAccountPayment.php

@@ -1,4 +1,4 @@
-PHPCommerce\Entity\OrderPayment:
+PHPCommerce\Payment\Entity\OrderPayment:
   type: entity
   table: order_payment