Merge branch 'develop'

ShopBundle/Resources/public/js/backend/script/order/vuejs-order.js

@@ -49,7 +49,7 @@ Vue.component('order-product', {
         },
         modalAddReductionCredit:function () {
             $(this.$parent.$refs['addReductionCreditFormTitle']).val(this.orderProduct.title);
-            $(this.$parent.$refs['addReductionCreditFormValue']).val(this.orderProduct.price);
+            $(this.$parent.$refs['addReductionCreditFormValue']).val(this.orderProduct.priceWithTaxAndReduction);
             $(this.$parent.$refs['addReductionCreditFormBehaviorTaxRate']).val('tax-included').trigger('change');
             $('#modal-add-reduction-credit').modal('show');
         }

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -292,6 +292,7 @@ field:
             cash: Espèce
             transfer: Virement
             credit: Compte prépayé
+            transfer-gift: Transfert de bon cadeau
         minimumAmountCb: "Paiement par carte bancaire : montant minimum"
         emailFrom: "Email (From) : email"
         emailFromName: "Email (From) : nom"

ShopBundle/Services/Price/OrderProductPriceUtils.php

@@ -89,7 +89,7 @@ class OrderProductPriceUtils
 
         public function getMarginPercent(OrderProductInterface $orderProduct)
         {
-                if ($this->getBuyingPrice($orderProduct)) {
+                if ($this->getBuyingPrice($orderProduct) && $this->getPriceWithReduction($orderProduct)) {
                         return $this->round(($this->getMargin($orderProduct) / $this->getPriceWithReduction($orderProduct)) * 100);
                 } else {
                         return 0;

ShopBundle/Services/Utils.php

@@ -47,6 +47,7 @@ class Utils
         const MEAN_PAYMENT_CREDIT = 'credit';
         const MEAN_PAYMENT_TRANSFER = 'transfer';
         const MEAN_PAYMENT_CASH = 'cash';
+        const MEAN_PAYMENT_GIFT = 'transfer-gift';
 
         public function __construct(EntityManagerInterface $em, ParameterBagInterface $parameterBag, SessionInterface $session, TranslatorInterface $translator, ConfigManager $configManager, CacheManager $liipCacheHelper)
         {