Squashed commit of the following:

commit 02c2671 Author: Alec Ritson <hello@itsalec.co.uk> Date: Fri Feb 10 11:13:49 2023 +0000 Update lines.blade.php (#849) commit 0780a1c Author: wychoong <67364036+wychoong@users.noreply.github.com> Date: Fri Feb 10 18:41:36 2023 +0800 Update CollectionTree.php (#835) Co-authored-by: Alec Ritson <hello@itsalec.co.uk> commit e558799 Author: Alec Ritson <hello@itsalec.co.uk> Date: Fri Feb 10 09:47:16 2023 +0000 :beer: commit 8fd4842 Merge: df6f7f7 51af420 Author: Alec Ritson <hello@itsalec.co.uk> Date: Fri Feb 10 09:47:03 2023 +0000 Merge branch '0.2' of github.com:lunarphp/lunar into 0.2 commit df6f7f7 Author: Alec Ritson <hello@itsalec.co.uk> Date: Fri Feb 10 09:47:00 2023 +0000 :beer: commit 51af420 Author: wychoong <67364036+wychoong@users.noreply.github.com> Date: Fri Feb 10 17:43:10 2023 +0800 [0.2] Hotfix - fix pluck on null (#834) * fix pluck on null * Update AbstractDiscount.php --------- Co-authored-by: Alec Ritson <hello@itsalec.co.uk> commit 7b5ce85 Author: wychoong <67364036+wychoong@users.noreply.github.com> Date: Fri Feb 10 17:16:50 2023 +0800 [0.2] Fix/discount by product (#841) * fix * add test * fix discount minSpend precision * fix discount condition logic * fix * fix coupon check commit 72f8454 Author: Alec Ritson <hello@itsalec.co.uk> Date: Fri Feb 10 09:16:16 2023 +0000 Hotfix [0.2] - Wrap customer group in array (#846) * Wrap customer group in array * Update ProductVariantTest.php commit b8773d3 Author: Ryan Mitchell <ryan@thoughtcollective.com> Date: Wed Feb 8 20:43:09 2023 +0000 When DB::table() is used make sure connection is passed (#826) commit 650d9db Merge: dcd39cc de20aff Author: Alec Ritson <hello@itsalec.co.uk> Date: Wed Feb 1 09:57:04 2023 +0000 Merge branch 'main' into 0.2 commit dcd39cc Author: Alec Ritson <hello@itsalec.co.uk> Date: Tue Jan 31 07:29:15 2023 +0000 :beer:
lunarphp · Feb 10, 2023 · 10ac7aa · 10ac7aa
1 parent de20aff
commit 10ac7aa
Show file tree

Hide file tree

Showing 18 changed files with 584 additions and 74 deletions.
diff --git a/packages/admin/resources/views/partials/orders/lines.blade.php b/packages/admin/resources/views/partials/orders/lines.blade.php
@@ -9,7 +9,7 @@
                 @endif
 
                 <div class="flex-shrink-0">
-                    @if ($thumbnail = $line->purchasable->getThumbnail())
+                    @if ($thumbnail = $line->purchasable?->getThumbnail())
                         <x-hub::thumbnail :src="$thumbnail->getUrl('small')" />
                     @else
                         <x-hub::icon ref="photograph"
@@ -94,7 +94,7 @@ class="w-6 mx-1 text-gray-400 -mt-7 group-hover:text-gray-500 xl:mt-0" />
                             <div class="flex text-xs font-medium text-gray-600">
                                 <p>{{ $line->identifier }}</p>
 
-                                @if ($line->purchasable->getOptions()->count())
+                                @if ($line->purchasable?->getOptions()?->count())
                                     <dl class="flex before:content-['|'] before:mx-3 before:text-gray-200 space-x-3">
                                         @foreach ($line->purchasable->getOptions() as $option)
                                             <div class="flex gap-0.5">

diff --git a/packages/admin/src/Http/Livewire/Components/Collections/CollectionTree.php b/packages/admin/src/Http/Livewire/Components/Collections/CollectionTree.php
@@ -79,10 +79,10 @@ public function sort($payload)
             $objectIdPositions = array_flip($ids);
 
             $models = Collection::withCount('children')
-            ->findMany($ids)
-            ->sortBy(function ($model) use ($objectIdPositions) {
-                return $objectIdPositions[$model->getKey()];
-            })->values();
+                ->findMany($ids)
+                ->sortBy(function ($model) use ($objectIdPositions) {
+                    return $objectIdPositions[$model->getKey()];
+                })->values();
 
             Collection::rebuildSubtree(
                 $models->first()->parent,
@@ -151,7 +151,7 @@ public function collectionMoved($id)
     {
         $parentId = collect($this->nodes)->first()['parent_id'];
         $this->nodes = $this->mapCollections(
-            Collection::whereParentId($parentId)->withCount('children')->defaultOrder()->get()
+            Collection::whereParentId($parentId)->inGroup($this->owner->id)->withCount('children')->defaultOrder()->get()
         );
     }
 
@@ -168,7 +168,7 @@ public function collectionsChanged($parentId)
 
         if ($parentMatched) {
             $this->nodes = $this->mapCollections(
-                Collection::whereParentId($parentId)->withCount('children')->defaultOrder()->get()
+                Collection::whereParentId($parentId)->inGroup($this->owner->id)->withCount('children')->defaultOrder()->get()
             );
         }
 
@@ -177,7 +177,7 @@ public function collectionsChanged($parentId)
 
         if ($nodeMatched) {
             $this->nodes = $this->mapCollections(
-                Collection::whereParentId($nodeMatched['parent_id'])->withCount('children')->defaultOrder()->get()
+                Collection::whereParentId($nodeMatched['parent_id'])->inGroup($this->owner->id)->withCount('children')->defaultOrder()->get()
             );
         }
     }

diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php b/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php
@@ -125,9 +125,6 @@ public function mount()
                 return $this->mapProductToArray($limitation->purchasable);
             });
 
-        $this->selectedBrands = $this->discount->brands->map(fn ($brand) => $this->mapBrandToArray($brand)) ?? collect();
-        $this->selectedCollections = $this->discount->collections->map(fn ($collection) => $this->mapCollectionToArray($collection)) ?? collect();
-
         $this->selectedConditions = $this->discount->purchasableConditions()
             ->wherePurchasableType(Product::class)
             ->pluck('purchasable_id')->values()->toArray();

diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/DiscountCreate.php b/packages/admin/src/Http/Livewire/Components/Discounts/DiscountCreate.php
@@ -33,6 +33,7 @@ public function mount()
 
         $this->selectedBrands = collect();
         $this->selectedCollections = collect();
+        $this->selectedProducts = collect();
     }
 
     /**

diff --git a/packages/admin/src/Http/Livewire/Components/Orders/OrdersTable.php b/packages/admin/src/Http/Livewire/Components/Orders/OrdersTable.php
@@ -83,9 +83,9 @@ public function build()
             SelectFilter::make('tags')->options(function () {
                 $tagTable = (new Tag)->getTable();
 
-                $tags = DB::table(
-                    config('lunar.database.table_prefix').'taggables'
-                )->join($tagTable, 'tag_id', '=', "{$tagTable}.id")
+                $tags = DB::connection(config('lunar.database.connection'))
+                ->table(config('lunar.database.table_prefix').'taggables')
+                ->join($tagTable, 'tag_id', '=', "{$tagTable}.id")
                 ->whereTaggableType(Order::class)
                 ->distinct()
                 ->pluck('value')

diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeShow.php b/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeShow.php
@@ -274,7 +274,8 @@ public function deleteGroup()
             return;
         }
         DB::transaction(function () {
-            DB::table(config('lunar.database.table_prefix').'attributables')
+            DB::connection(config('lunar.database.connection'))
+                ->table(config('lunar.database.table_prefix').'attributables')
                 ->whereIn(
                     'attribute_id',
                     $this->attributeGroupToDelete->attributes()->pluck('id')->toArray()
@@ -293,7 +294,8 @@ public function deleteGroup()
     public function deleteAttribute()
     {
         DB::transaction(function () {
-            DB::table(config('lunar.database.table_prefix').'attributables')
+            DB::connection(config('lunar.database.connection'))
+                ->table(config('lunar.database.table_prefix').'attributables')
                 ->where(
                     'attribute_id',
                     $this->attributeToDelete->id

diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Tags/TagShow.php b/packages/admin/src/Http/Livewire/Components/Settings/Tags/TagShow.php
@@ -29,7 +29,8 @@ public function getTaggablesProperty()
     {
         $prefix = config('lunar.database.table_prefix');
 
-        return DB::table(
+        return DB::connection(config('lunar.database.connection'))
+        ->table(
             "{$prefix}taggables"
         )->select([
             'taggable_type',

diff --git a/packages/admin/src/Http/Livewire/Components/Tags.php b/packages/admin/src/Http/Livewire/Components/Tags.php
@@ -98,7 +98,8 @@ public function getAvailableTagsProperty()
             return collect();
         }
 
-        return DB::table(
+        return DB::connection(config('lunar.database.connection'))
+        ->table(
             config('lunar.database.table_prefix').'taggables'
         )->join($tagTable, 'tag_id', '=', "{$tagTable}.id")
             ->whereTaggableType(

diff --git a/...admin/tests/Unit/Http/Livewire/Components/Products/ProductTypes/ProductTypeCreateTest.php b/...admin/tests/Unit/Http/Livewire/Components/Products/ProductTypes/ProductTypeCreateTest.php
@@ -75,6 +75,7 @@ public function component_has_system_attributes_preselected()
 
     /**
      * @test
+     *
      * @group foo
      * */
     public function can_populate_product_type_data_and_attributes()

diff --git a/packages/core/database/factories/CartFactory.php b/packages/core/database/factories/CartFactory.php
@@ -18,7 +18,6 @@ public function definition(): array
             'merged_id' => null,
             'currency_id' => Currency::factory(),
             'channel_id' => Channel::factory(),
-            'coupon_code' => $this->faker->boolean ? $this->faker->word : null,
             'completed_at' => null,
             'meta' => [],
         ];

diff --git a/packages/core/src/DiscountTypes/AbstractDiscountType.php b/packages/core/src/DiscountTypes/AbstractDiscountType.php
@@ -2,7 +2,9 @@
 
 namespace Lunar\DiscountTypes;
 
+use Illuminate\Support\Collection;
 use Lunar\Base\DiscountTypeInterface;
+use Lunar\Models\Cart;
 use Lunar\Models\Discount;
 
 abstract class AbstractDiscountType implements DiscountTypeInterface
@@ -38,4 +40,41 @@ public function markAsUsed(): self
 
         return $this;
     }
+
+    /**
+     * Return the eligible lines for the discount.
+     *
+     * @param  Cart  $cart
+     * @return Illuminate\Support\Collection
+     */
+    protected function getEligibleLines(Cart $cart): Collection
+    {
+        return $cart->lines;
+    }
+
+    /**
+     * Check if discount's conditions met.
+     *
+     * @param  Cart  $cart
+     * @return bool
+     */
+    protected function checkDiscountConditions(Cart $cart): bool
+    {
+        $data = $this->discount->data;
+
+        $cartCoupon = strtoupper($cart->coupon_code ?? null);
+        $conditionCoupon = strtoupper($this->discount->coupon ?? null);
+
+        $validCoupon = $cartCoupon ? ($cartCoupon === $conditionCoupon) : blank($conditionCoupon);
+
+        $minSpend = $data['min_prices'][$cart->currency->code] ?? null;
+        $minSpend = (int) bcmul($minSpend, $cart->currency->factor);
+
+        $lines = $this->getEligibleLines($cart);
+        $validMinSpend = $minSpend ? $minSpend < $lines->sum('subTotal.value') : true;
+
+        $validMaxUses = $this->discount->max_uses ? $this->discount->uses < $this->discount->max_uses : true;
+
+        return $validCoupon && $validMinSpend && $validMaxUses;
+    }
 }
diff --git a/packages/core/src/DiscountTypes/Discount.php b/packages/core/src/DiscountTypes/Discount.php
@@ -28,16 +28,7 @@ public function apply(Cart $cart): Cart
     {
         $data = $this->discount->data;
 
-        $cartCoupon = strtoupper($cart->coupon_code ?? null);
-        $conditionCoupon = strtoupper($this->discount->coupon ?? null);
-
-        $passes = $cartCoupon && ($cartCoupon === $conditionCoupon);
-
-        $minSpend = $data['min_prices'][$cart->currency->code] ?? null;
-
-        $lines = $this->getEligibleLines($cart);
-
-        if (! $passes || ($minSpend && $minSpend >= $lines->sum('subTotal.value'))) {
+        if (! $this->checkDiscountConditions($cart)) {
             return $cart;
         }
 
@@ -65,7 +56,7 @@ private function applyFixedValue(array $values, Cart $cart): Cart
     {
         $currency = $cart->currency;
 
-        $value = ($values[$currency->code] ?? 0) * 100;
+        $value = (int) bcmul($values[$currency->code] ?? 0, $currency->factor);
 
         $lines = $this->getEligibleLines($cart);
 
@@ -92,9 +83,9 @@ private function applyFixedValue(array $values, Cart $cart): Cart
      * Return the eligible lines for the discount.
      *
      * @param  Cart  $cart
-     * @return Collection
+     * @return \Illuminate\Support\Collection
      */
-    private function getEligibleLines(Cart $cart)
+    protected function getEligibleLines(Cart $cart): \Illuminate\Support\Collection
     {
         $collectionIds = $this->discount->collections->pluck('id');
         $brandIds = $this->discount->brands->pluck('id');

diff --git a/packages/core/src/Managers/PricingManager.php b/packages/core/src/Managers/PricingManager.php
@@ -164,9 +164,9 @@ public function get()
         }
 
         if (! $this->customerGroups || ! $this->customerGroups->count()) {
-            $this->customerGroups = collect(
-                CustomerGroup::getDefault()
-            );
+            $this->customerGroups = collect([
+                CustomerGroup::getDefault(),
+            ]);
         }
 
         // Do we have a user?

diff --git a/packages/core/tests/Unit/Base/Traits/HasCustomerGroupsTest.php b/packages/core/tests/Unit/Base/Traits/HasCustomerGroupsTest.php
@@ -82,6 +82,7 @@ public function can_schedule_using_collection_of_models()
 
     /**
      * @test
+     *
      * @group testerr
      * */
     public function throws_exception_if_non_customer_group_provided()

diff --git a/packages/core/tests/Unit/DiscountTypes/BuyXGetYTest.php b/packages/core/tests/Unit/DiscountTypes/BuyXGetYTest.php
@@ -184,6 +184,7 @@ public function can_discount_eligible_product()
 
     /**
      * @test
+     *
      * @group thisthis
      */
     public function can_discount_eligible_products()
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ public function mount() @@
             $this->selectedBrands = collect();
             $this->selectedCollections = collect();
+            $this->selectedProducts = collect();
         }
         /**
@@ Expand Down @@