Merge pull request #107 from tastyigniter/4.x

Release v4.1.2

Author: sampoyigi

resources/lang/en/default.php

@@ -633,5 +633,8 @@
         'text_delivery_order_count' => 'Number of Delivery Orders',
         'text_canceled_order_total' => 'Total Canceled Orders',
         'text_canceled_order_count' => 'Number of Canceled Orders',
+        'text_onboarding_menus' => 'Build your menu',
+
+        'help_onboarding_menus' => 'Add your dishes, organize them into categories, and set prices. This is what your hungry customers will browse and order from.',
     ],
 ];

resources/models/inventory.php

@@ -27,7 +27,8 @@
     'stockable_type_name' => [
         'label' => 'lang:igniter.cart::default.stocks.column_stockable_type',
         'type' => 'text',
-        'searchable' => true,
+        'select' => 'stockable_type',
+        'searchable' => false,
     ],
     'stockable_name' => [
         'label' => 'lang:igniter.cart::default.stocks.column_stockable_name',

src/Cart.php

@@ -16,12 +16,10 @@
 
 class Cart
 {
-    public const string DEFAULT_INSTANCE = 'default';
-
     /**
      * Holds the current cart instance.
      */
-    protected string $instance = self::DEFAULT_INSTANCE;
+    protected string $instance = 'default';
 
     /**
      * @var ?CartConditions Instance of the cart condition.
@@ -61,7 +59,7 @@ public function instance(?string $instance = null): static
      */
     public function currentInstance(): string
     {
-        return str_replace('cart.', '', $this->instance);
+        return $this->instance;
     }
 
     /**
@@ -560,13 +558,16 @@ protected function storedCartWithIdentifierExists($identifier)
     {
         return $this->createModel()
             ->where('identifier', $identifier)
-            ->where('instance', $this->currentInstance())->exists();
+            ->where('instance', $this->currentInstance())
+            ->exists();
     }
 
     protected function getStoredCartByIdentifier($identifier)
     {
         return $this->createModel()
-            ->where('identifier', $identifier)->first();
+            ->where('identifier', $identifier)
+            ->where('instance', $this->currentInstance())
+            ->first();
     }
 
     /**

src/CartItem.php

@@ -305,11 +305,9 @@ protected function makeCartItemConditions($conditions)
 
     /**
      * Get the instance as an array.
-     *
-     * @return array
      */
     #[Override]
-    public function toArray()
+    public function toArray(): array
     {
         return [
             'rowId' => $this->rowId,

src/CartItemOption.php

@@ -91,11 +91,9 @@ protected function makeCartOptionValues($values)
 
     /**
      * Get the instance as an array.
-     *
-     * @return array
      */
     #[Override]
-    public function toArray()
+    public function toArray(): array
     {
         return [
             'id' => $this->id,

src/CartItemOptionValue.php

@@ -121,11 +121,9 @@ public static function fromArray(array $attributes): self
 
     /**
      * Get the instance as an array.
-     *
-     * @return array
      */
     #[Override]
-    public function toArray()
+    public function toArray(): array
     {
         return [
             'id' => $this->id,

src/Classes/CartManager.php

@@ -368,7 +368,7 @@ public function validateMenuItem(Menu $menuItem): void
                 sprintf(
                     lang('igniter.cart::default.alert_menu_not_within_mealtimes'),
                     $menuItem->menu_name,
-                    strtolower((string) $menuItem->mealtimes->filter(fn(Mealtime $mealtime): bool => $mealtime->isEnabled())
+                    strtolower((string)$menuItem->mealtimes->filter(fn(Mealtime $mealtime): bool => $mealtime->isEnabled())
                         ->pluck('description')
                         ->join(', ')),
                 ),

src/Database/Factories/StockFactory.php

@@ -14,7 +14,7 @@ class StockFactory extends Factory
     protected $model = Stock::class;
 
     #[Override]
-    public function definition()
+    public function definition(): array
     {
         return [
             'location_id' => Location::factory(),

src/Database/Factories/StockHistoryFactory.php

@@ -16,7 +16,7 @@ class StockHistoryFactory extends Factory
     protected $model = StockHistory::class;
 
     #[Override]
-    public function definition()
+    public function definition(): array
     {
         return [
             'stock_id' => Stock::factory(),

src/Extension.php

@@ -472,4 +472,18 @@ protected function registerMiddlewares(): void
             $this->app['router']->pushMiddlewareToGroup('igniter', CartMiddleware::class);
         }
     }
+
+    public function registerOnboardingSteps(): array
+    {
+        return [
+            'igniter.cart::menus' => [
+                'label' => 'igniter.cart::default.dashboard.text_onboarding_menus',
+                'description' => 'igniter.cart::default.dashboard.help_onboarding_menus',
+                'icon' => 'fa-cutlery',
+                'url' => admin_url('menus'),
+                'priority' => 30,
+                'complete' => Menu::onboardingIsComplete(...),
+            ],
+        ];
+    }
 }