diff --git a/app/Cart/TransactionDraft.php b/app/Cart/TransactionDraft.php
index 76fa37d..4c00da7 100644
--- a/app/Cart/TransactionDraft.php
+++ b/app/Cart/TransactionDraft.php
@@ -156,6 +156,7 @@ abstract class TransactionDraft
public function destroy()
{
$cart = app(CartCollection::class);
+
return $cart->removeDraft($this->draftKey);
}
}
diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php
index 6b82167..34a4a13 100755
--- a/app/Helpers/helpers.php
+++ b/app/Helpers/helpers.php
@@ -29,5 +29,4 @@ function html_link_to_route($name, $title = null, $parameters = [], $attributes
}
return app('html')->decode(link_to_route($name, $title, $parameters, $attributes));
-
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php
index 4e45fe6..ec08859 100644
--- a/app/Http/Controllers/CartController.php
+++ b/app/Http/Controllers/CartController.php
@@ -31,6 +31,7 @@ class CartController extends Controller
$draft = $this->cart->get($draftKey);
if (is_null($draft)) {
flash(trans('transaction.draft_not_found'), 'danger');
+
return redirect()->route('cart.index');
}
@@ -94,6 +95,7 @@ class CartController extends Controller
}
$lastDraft = $this->cart->content()->last();
+
return redirect()->route('cart.show', $lastDraft->draftKey);
}
@@ -117,10 +119,12 @@ class CartController extends Controller
if ($draft->getItemsCount() == 0) {
flash(trans('transaction.item_list_empty'), 'warning')->important();
+
return redirect()->route('cart.show', [$draftKey]);
}
flash(trans('transaction.confirm_instruction', ['back_link' => link_to_route('cart.show', trans('app.back'), $draftKey)]), 'warning')->important();
+
return redirect()->route('cart.show', [$draftKey, 'action' => 'confirm']);
}
@@ -134,6 +138,7 @@ class CartController extends Controller
$transaction = $draft->store();
$draft->destroy();
flash(trans('transaction.created', ['invoice_no' => $transaction->invoice_no]), 'success')->important();
+
return redirect()->route('cart.index');
}
}
diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php
index 5659b79..b46830f 100644
--- a/resources/lang/id/app.php
+++ b/resources/lang/id/app.php
@@ -35,4 +35,4 @@ return [
'welcome' => 'Selamat datang',
'export-pdf' => 'Export PDF',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/id/transaction.php b/resources/lang/id/transaction.php
index a23041d..7ad8a6d 100644
--- a/resources/lang/id/transaction.php
+++ b/resources/lang/id/transaction.php
@@ -2,29 +2,29 @@
return [
// Labels
- 'create' => 'Buat Transaksi',
- 'create_cash' => 'Buat Transaksi Tunai',
- 'create_credit' => 'Buat Transaksi Kredit',
- 'cash' => 'Tunai',
- 'credit' => 'Kredit',
- 'detail' => 'Detail Transaksi',
- 'confirm' => 'Konfirmasi Transaksi',
- 'items' => 'Barang Belanja',
- 'subtotal' => 'Subtotal',
- 'discount_total' => 'Total Diskon',
- 'total' => 'Total',
- 'exchange' => 'Kembalian',
- 'draft_added' => 'Draft transaksi :type telah ditambahkan.',
- 'draft_removed' => 'Draft transaksi telah dihapus.',
+ 'create' => 'Buat Transaksi',
+ 'create_cash' => 'Buat Transaksi Tunai',
+ 'create_credit' => 'Buat Transaksi Kredit',
+ 'cash' => 'Tunai',
+ 'credit' => 'Kredit',
+ 'detail' => 'Detail Transaksi',
+ 'confirm' => 'Konfirmasi Transaksi',
+ 'items' => 'Barang Belanja',
+ 'subtotal' => 'Subtotal',
+ 'discount_total' => 'Total Diskon',
+ 'total' => 'Total',
+ 'exchange' => 'Kembalian',
+ 'draft_added' => 'Draft transaksi :type telah ditambahkan.',
+ 'draft_removed' => 'Draft transaksi telah dihapus.',
'draft_destroyed' => 'Seluruh Draft transaksi telah dihapus.',
'draft_not_found' => 'Draft transaksi tidak ditemukan.',
// Actions
- 'proccess' => 'Proses Transaksi',
+ 'proccess' => 'Proses Transaksi',
'confirm_instruction' => 'Silakan periksa rincian belanja dibawah ini, jika belum sesuai, silakan :back_link',
- 'item_list_empty' => 'Masukkan setidaknya 1 item produk.',
- 'save' => 'Simpan Transaksi',
- 'created' => 'Transaksi berhasil disimpan, No. Invoice: :invoice_no',
+ 'item_list_empty' => 'Masukkan setidaknya 1 item produk.',
+ 'save' => 'Simpan Transaksi',
+ 'created' => 'Transaksi berhasil disimpan, No. Invoice: :invoice_no',
// Attributes
'customer' => 'Customer',
diff --git a/tests/Feature/TransactionEntryTest.php b/tests/Feature/TransactionEntryTest.php
index 5431255..d21365e 100644
--- a/tests/Feature/TransactionEntryTest.php
+++ b/tests/Feature/TransactionEntryTest.php
@@ -235,11 +235,11 @@ class TransactionEntryTest extends BrowserKitTestCase
$this->press(trans('transaction.save'));
$this->seePageIs(route('cart.index'));
- $this->see(trans('transaction.created', ['invoice_no' => date('ym') . '0001']));
+ $this->see(trans('transaction.created', ['invoice_no' => date('ym').'0001']));
$this->seeInDatabase('transactions', [
- 'invoice_no' => date('ym') . '0001',
- 'items' => '[{"id":' . $product1->id . ',"name":"' . $product1->name . '","price":1000,"qty":1,"item_discount":0,"item_discount_subtotal":0,"subtotal":1000},{"id":' . $product2->id . ',"name":"' . $product2->name . '","price":2000,"qty":3,"item_discount":0,"item_discount_subtotal":0,"subtotal":6000}]',
+ 'invoice_no' => date('ym').'0001',
+ 'items' => '[{"id":'.$product1->id.',"name":"'.$product1->name.'","price":1000,"qty":1,"item_discount":0,"item_discount_subtotal":0,"subtotal":1000},{"id":'.$product2->id.',"name":"'.$product2->name.'","price":2000,"qty":3,"item_discount":0,"item_discount_subtotal":0,"subtotal":6000}]',
'customer' => '{"name":"Nafies","phone":"081234567890"}',
'payment' => 10000,
'total' => 7000,
diff --git a/tests/Unit/Integration/TransactionDraftTest.php b/tests/Unit/Integration/TransactionDraftTest.php
index 4a25784..9f80786 100644
--- a/tests/Unit/Integration/TransactionDraftTest.php
+++ b/tests/Unit/Integration/TransactionDraftTest.php
@@ -214,8 +214,8 @@ class TransactionDraftTest extends TestCase
$draft->store();
$this->assertDatabaseHas('transactions', [
- 'invoice_no' => date('ym') . '0001',
- 'items' => '[{"id":' . $product1->id . ',"name":"' . $product1->name . '","price":1000,"qty":1,"item_discount":0,"item_discount_subtotal":0,"subtotal":1000},{"id":' . $product2->id . ',"name":"' . $product2->name . '","price":2000,"qty":3,"item_discount":0,"item_discount_subtotal":0,"subtotal":6000}]',
+ 'invoice_no' => date('ym').'0001',
+ 'items' => '[{"id":'.$product1->id.',"name":"'.$product1->name.'","price":1000,"qty":1,"item_discount":0,"item_discount_subtotal":0,"subtotal":1000},{"id":'.$product2->id.',"name":"'.$product2->name.'","price":2000,"qty":3,"item_discount":0,"item_discount_subtotal":0,"subtotal":6000}]',
'customer' => '{"name":"Nafies","phone":"081234567890"}',
'payment' => 10000,
'total' => 7000,