Code refactor

Signed-off-by: Sam Poyigi <[email protected]>

src/Classes/CartManager.php

@@ -34,6 +34,8 @@ class CartManager
      */
     protected $settings;
 
+    protected $menuItemCache = [];
+
     public function __construct()
     {
         $this->cart = App::make('cart');
@@ -68,7 +70,11 @@ public function findMenuItem($menuId)
             throw new ApplicationException(lang('igniter.cart::default.alert_no_menu_selected'));
         }
 
-        return Menu::findBy($menuId, $this->location->current());
+        if (array_key_exists($menuId, $this->menuItemCache)) {
+            return $this->menuItemCache[$menuId];
+        }
+
+        return $this->menuItemCache[$menuId] = Menu::findBy($menuId, $this->location->current());
     }
 
     public function addCartItem($menuId, array $properties = [])
@@ -285,7 +291,7 @@ public function validateContents()
         }
 
         $this->cart->content()->each(function(CartItem $cartItem) {
-            $menuItem = $cartItem->model;
+            $menuItem = $this->findMenuItem($cartItem->id);
 
             $this->validateCartMenuItem($menuItem, $cartItem->qty);
 

src/Classes/OrderManager.php

@@ -304,7 +304,7 @@ public function getCartTotals()
                 $total = [
                     'code' => $condition->name,
                     'title' => $condition->getLabel(),
-                    'value' => $condition->getValue(),
+                    'value' => is_numeric($value = $condition->getValue()) ? $value : 0,
                     'priority' => $condition->getPriority() ?: 1,
                     'is_summable' => false,
                 ];
@@ -322,7 +322,7 @@ public function getCartTotals()
             return [
                 'code' => $condition->name,
                 'title' => $condition->getLabel(),
-                'value' => $condition->getValue(),
+                'value' => is_numeric($value = $condition->getValue()) ? $value : 0,
                 'priority' => $condition->getPriority() ?: 1,
                 'is_summable' => !$condition->isInclusive(),
             ];

src/Models/Order.php

@@ -196,7 +196,7 @@ public function isCancelable()
             return false;
         }
 
-        return floor($this->order_datetime->diffInRealMinutes()) > $timeout;
+        return now()->diffInRealMinutes($this->reservation_datetime) > $timeout;
     }
 
     /**