diff --git a/app/Cart/TransactionDraft.php b/app/Cart/TransactionDraft.php index 22e9ae6..36a8478 100644 --- a/app/Cart/TransactionDraft.php +++ b/app/Cart/TransactionDraft.php @@ -62,6 +62,11 @@ abstract class TransactionDraft return $this->items()->sum('subtotal') - $this->getDiscountTotal(); } + public function getItemsCount() + { + return $this->items()->count(); + } + public function getTotalQty() { return $this->items()->sum('qty'); diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index 5994dc1..0818db5 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -85,7 +85,11 @@ class CartController extends Controller { $this->cart->removeDraft($request->draft_key); - return redirect()->route('cart.index'); + if ($this->cart->isEmpty()) + return redirect()->route('cart.index'); + + $lastDraft = $this->cart->content()->last(); + return redirect()->route('cart.show', $lastDraft->draftKey); } public function destroy() diff --git a/resources/views/cart/partials/draft-item-list.blade.php b/resources/views/cart/partials/draft-item-list.blade.php index d9ee409..7da8017 100644 --- a/resources/views/cart/partials/draft-item-list.blade.php +++ b/resources/views/cart/partials/draft-item-list.blade.php @@ -1,4 +1,9 @@ -{{ trans('transaction.items') }} ({{ $draft->items()->count() }} Item) + + {{ trans('transaction.items') }} + + ({{ $draft->getItemsCount() }} Item, {{ $draft->getTotalQty() }} Pcs) + +