Add bonus points deduct

BitBagCommerce · Aug 22, 2019 · b312169 · b312169
1 parent 320feac
commit b312169
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 9 deletions.
diff --git a/src/Assigner/BonusPointsAssigner.php b/src/Assigner/BonusPointsAssigner.php
@@ -6,10 +6,13 @@
 
 use BitBag\SyliusBonusPointsPlugin\Calculator\DelegatingBonusPointsStrategyCalculatorInterface;
 use BitBag\SyliusBonusPointsPlugin\Checker\Eligibility\BonusPointsStrategyEligibilityCheckerInterface;
+use BitBag\SyliusBonusPointsPlugin\Entity\AdjustmentInterface;
 use BitBag\SyliusBonusPointsPlugin\Entity\BonusPointsInterface;
+use BitBag\SyliusBonusPointsPlugin\Entity\BonusPointsStrategyInterface;
 use BitBag\SyliusBonusPointsPlugin\Entity\CustomerBonusPointsInterface;
 use BitBag\SyliusBonusPointsPlugin\Repository\BonusPointsStrategyRepositoryInterface;
 use Doctrine\ORM\EntityManagerInterface;
+use Sylius\Component\Core\Distributor\ProportionalIntegerDistributorInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\OrderItemInterface;
@@ -42,6 +45,9 @@ final class BonusPointsAssigner implements BonusPointsAssignerInterface
     /** @var FactoryInterface */
     private $customerBonusPointsFactory;
 
+    /** @var ProportionalIntegerDistributorInterface */
+    private $proportionalIntegerDistributor;
+
     public function __construct(
         DelegatingBonusPointsStrategyCalculatorInterface $delegatingBonusPointsStrategyCalculator,
         BonusPointsStrategyEligibilityCheckerInterface $bonusPointsStrategyEligibilityChecker,
@@ -50,7 +56,8 @@ public function __construct(
         FactoryInterface $bonusPointsFactory,
         EntityManagerInterface $bonusPointsEntityManager,
         RepositoryInterface $customerBonusPointsRepository,
-        FactoryInterface $customerBonusPointsFactory
+        FactoryInterface $customerBonusPointsFactory,
+        ProportionalIntegerDistributorInterface $proportionalIntegerDistributor
     ) {
         $this->delegatingBonusPointsStrategyCalculator = $delegatingBonusPointsStrategyCalculator;
         $this->bonusPointsStrategyEligibilityChecker = $bonusPointsStrategyEligibilityChecker;
@@ -60,6 +67,7 @@ public function __construct(
         $this->bonusPointsEntityManager = $bonusPointsEntityManager;
         $this->customerBonusPointsRepository = $customerBonusPointsRepository;
         $this->customerBonusPointsFactory = $customerBonusPointsFactory;
+        $this->proportionalIntegerDistributor = $proportionalIntegerDistributor;
     }
 
     public function assign(OrderInterface $order): void
@@ -68,12 +76,25 @@ public function assign(OrderInterface $order): void
 
         $bonusPointsTotal = 0;
 
+        /** @var BonusPointsStrategyInterface $bonusPointsStrategy */
         foreach ($bonusPointsStrategies as $bonusPointsStrategy) {
             if ($this->delegatingBonusPointsStrategyCalculator->isPerOrderItem($bonusPointsStrategy)) {
+                if ($bonusPointsStrategy->isDeductBonusPoints()) {
+                    $splitAmountOrderItems = $this->getProportionalIntegerToDeduct(
+                        $bonusPointsStrategy,
+                        $order->getItems()->toArray(),
+                        $order->getAdjustmentsTotal(AdjustmentInterface::ORDER_BONUS_POINTS_ADJUSTMENT)
+                    );
+                }
+
                 /** @var OrderItemInterface $orderItem */
                 foreach ($order->getItems() as $orderItem) {
                     if ($this->bonusPointsStrategyEligibilityChecker->isEligible($orderItem, $bonusPointsStrategy)) {
-                        $bonusPointsTotal += $this->delegatingBonusPointsStrategyCalculator->calculate($orderItem, $bonusPointsStrategy);
+                        $bonusPointsTotal += $this->delegatingBonusPointsStrategyCalculator->calculate(
+                            $orderItem,
+                            $bonusPointsStrategy,
+                            $bonusPointsStrategy->isDeductBonusPoints() ? $splitAmountOrderItems[$orderItem->getId()] : 0
+                        );
                     }
                 }
             } else {
@@ -87,7 +108,11 @@ public function assign(OrderInterface $order): void
                 }
 
                 if (true === $status) {
-                    $bonusPointsTotal += $this->delegatingBonusPointsStrategyCalculator->calculate($order, $bonusPointsStrategy);
+                    $bonusPointsTotal += $this->delegatingBonusPointsStrategyCalculator->calculate(
+                        $order,
+                        $bonusPointsStrategy,
+                        $order->getAdjustmentsTotal(AdjustmentInterface::ORDER_BONUS_POINTS_ADJUSTMENT)
+                    );
                 }
             }
         }
@@ -125,4 +150,34 @@ private function getCustomerBonusPoints(CustomerInterface $customer): CustomerBo
 
         return $customerBonusPoints;
     }
+
+    private function getProportionalIntegerToDeduct(BonusPointsStrategyInterface $bonusPointsStrategy, array $orderItems, int $bonusPointsAmount): array
+    {
+        /** @var OrderItemInterface[] $itemsEligible */
+        $itemsEligible = [];
+
+        foreach ($orderItems as $orderItem) {
+            if ($this->bonusPointsStrategyEligibilityChecker->isEligible($orderItem, $bonusPointsStrategy)) {
+                $itemsEligible[] = $orderItem;
+            }
+        }
+
+        $totals = [];
+
+        foreach ($itemsEligible as $item) {
+            $totals[] = $item->getTotal();
+        }
+
+        $splitAmount = $this->proportionalIntegerDistributor->distribute($totals, $bonusPointsAmount);
+
+        $splitAmountOrderItems = [];
+
+        $i = 0;
+
+        foreach ($itemsEligible as $item) {
+            $splitAmountOrderItems[$item->getId()] = $splitAmount[$i++];
+        }
+
+        return $splitAmountOrderItems;
+    }
 }
diff --git a/src/Calculator/BonusPointsStrategyCalculatorInterface.php b/src/Calculator/BonusPointsStrategyCalculatorInterface.php
@@ -6,7 +6,7 @@
 
 interface BonusPointsStrategyCalculatorInterface
 {
-    public function calculate($subject, array $configuration): int;
+    public function calculate($subject, array $configuration, int $amountToDeduct = 0): int;
 
     public function isPerOrderItem(): bool;
 

diff --git a/src/Calculator/DelegatingBonusPointsStrategyCalculator.php b/src/Calculator/DelegatingBonusPointsStrategyCalculator.php
@@ -17,12 +17,12 @@ public function __construct(ServiceRegistryInterface $registry)
         $this->registry = $registry;
     }
 
-    public function calculate($subject, BonusPointsStrategyInterface $bonusPointsStrategy): int
+    public function calculate($subject, BonusPointsStrategyInterface $bonusPointsStrategy, int $amountToDeduct = 0): int
     {
         /** @var BonusPointsStrategyCalculatorInterface $calculator */
         $calculator = $this->registry->get($bonusPointsStrategy->getCalculatorType());
 
-        return $calculator->calculate($subject, $bonusPointsStrategy->getCalculatorConfiguration());
+        return $calculator->calculate($subject, $bonusPointsStrategy->getCalculatorConfiguration(), $amountToDeduct);
     }
 
     public function isPerOrderItem(BonusPointsStrategyInterface $bonusPointsStrategy): bool

diff --git a/src/Calculator/DelegatingBonusPointsStrategyCalculatorInterface.php b/src/Calculator/DelegatingBonusPointsStrategyCalculatorInterface.php
@@ -8,7 +8,7 @@
 
 interface DelegatingBonusPointsStrategyCalculatorInterface
 {
-    public function calculate($subject, BonusPointsStrategyInterface $bonusPointsStrategy): int;
+    public function calculate($subject, BonusPointsStrategyInterface $bonusPointsStrategy, int $amountToDeduct): int;
 
     public function isPerOrderItem(BonusPointsStrategyInterface $bonusPointsStrategy): bool;
 }
diff --git a/src/Calculator/PerOrderItemPercentageCalculator.php b/src/Calculator/PerOrderItemPercentageCalculator.php
@@ -10,7 +10,7 @@
 
 final class PerOrderItemPercentageCalculator implements BonusPointsStrategyCalculatorInterface
 {
-    public function calculate($subject, array $configuration): int
+    public function calculate($subject, array $configuration, int $amountToDeduct = 0): int
     {
         /** @var OrderItemInterface $subject */
         Assert::isInstanceOf($subject, OrderItemInterface::class);
@@ -20,7 +20,13 @@ public function calculate($subject, array $configuration): int
 
         $configuration = $configuration[$order->getChannel()->getCode()];
 
-        return intval($subject->getTotal() * $configuration['percentToCalculatePoints']);
+        $total = $subject->getTotal();
+
+        if ($amountToDeduct < 0) {
+            $total += $amountToDeduct;
+        }
+
+        return intval(round($total * $configuration['percentToCalculatePoints']));
     }
 
     public function isPerOrderItem(): bool

diff --git a/src/Entity/BonusPointsStrategy.php b/src/Entity/BonusPointsStrategy.php
@@ -32,6 +32,9 @@ class BonusPointsStrategy implements BonusPointsStrategyInterface
     /** @var Collection|BonusPointsStrategyRuleInterface[] */
     protected $rules;
 
+    /** @var bool */
+    protected $isDeductBonusPoints = false;
+
     public function __construct()
     {
         $this->createdAt = new \DateTime();
@@ -111,4 +114,14 @@ public function removeRule(BonusPointsStrategyRuleInterface $rule): void
         $rule->setBonusPointsStrategy(null);
         $this->rules->removeElement($rule);
     }
+
+    public function isDeductBonusPoints(): bool
+    {
+        return $this->isDeductBonusPoints;
+    }
+
+    public function setIsDeductBonusPoints(bool $isDeductBonusPoints): void
+    {
+        $this->isDeductBonusPoints = $isDeductBonusPoints;
+    }
 }
diff --git a/src/Entity/BonusPointsStrategyInterface.php b/src/Entity/BonusPointsStrategyInterface.php
@@ -41,4 +41,8 @@ public function removeRule(BonusPointsStrategyRuleInterface $rule): void;
     public function getCalculatorType(): ?string;
 
     public function setCalculatorType(?string $calculatorType): void;
+
+    public function isDeductBonusPoints(): bool;
+
+    public function setIsDeductBonusPoints(bool $isDeductBonusPoints): void;
 }
diff --git a/src/Form/Type/BonusPointsStrategyType.php b/src/Form/Type/BonusPointsStrategyType.php
@@ -46,6 +46,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ->add('enabled', CheckboxType::class, [
                 'label' => 'bitbag_sylius_bonus_points.ui.enabled',
             ])
+            ->add('isDeductBonusPoints', CheckboxType::class, [
+                'label' => 'bitbag_sylius_bonus_points.ui.is_deduct_bonus_points',
+            ])
             ->add('rules', BonusPointsStrategyRuleCollectionType::class, [
                 'label' => 'bitbag_sylius_bonus_points.ui.rules',
             ])

diff --git a/src/Resources/config/doctrine/BonusPointsStrategy.orm.xml b/src/Resources/config/doctrine/BonusPointsStrategy.orm.xml
@@ -13,6 +13,7 @@
         <field name="calculatorType" column="calculator_type" type="string"/>
         <field name="calculatorConfiguration" column="calculator_configuration" type="array"/>
         <field name="enabled" type="boolean"/>
+        <field name="isDeductBonusPoints" column="is_deduct_bonus_points" type="boolean"/>
 
         <field name="createdAt" column="created_at" type="datetime">
             <gedmo:timestampable on="create"/>

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -20,6 +20,7 @@
             <argument type="service" id="bitbag_sylius_bonus_points.manager.bonus_points" />
             <argument type="service" id="bitbag_sylius_bonus_points.repository.customer_bonus_points" />
             <argument type="service" id="bitbag_sylius_bonus_points.factory.customer_bonus_points" />
+            <argument type="service" id="sylius.proportional_integer_distributor" />
         </service>
 
         <service id="bitbag_sylius_bonus_points.context.customer_bonus_points" class="BitBag\SyliusBonusPointsPlugin\Context\CustomerBonusPointsContext">

diff --git a/src/Resources/translations/messages.en.yml b/src/Resources/translations/messages.en.yml
@@ -17,3 +17,4 @@ bitbag_sylius_bonus_points:
         apply_points: Apply points
         bonus_points_total: Bonus points total
         you_have_bonus_points_available: You have bonus points available
+        is_deduct_bonus_points: Is deduct bonus points
diff --git a/src/Resources/views/Admin/BonusPointsStrategy/_form.html.twig b/src/Resources/views/Admin/BonusPointsStrategy/_form.html.twig
@@ -12,6 +12,7 @@
     <div class="column">
         <div class="ui segment">
             {{ form_row(form.calculatorType) }}
+            {{ form_row(form.isDeductBonusPoints) }}
             {% for name, calculatorConfigurationPrototype in form.vars.prototypes %}
                 <div id="{{ form.calculatorType.vars.id }}_{{ name }}" data-container=".configuration"
                      data-prototype="{{ form_widget(calculatorConfigurationPrototype)|e }}">