diff --git a/app/Http/Controllers/Admins/Pengeluaran/PengeluaranController.php b/app/Http/Controllers/Admins/Pengeluaran/PengeluaranController.php
index 657e2d3..d050303 100644
--- a/app/Http/Controllers/Admins/Pengeluaran/PengeluaranController.php
+++ b/app/Http/Controllers/Admins/Pengeluaran/PengeluaranController.php
@@ -25,6 +25,11 @@ class PengeluaranController extends Controller
$distributors = MasterDistributor::all();
$satuans = MasterSatuan::all();
$getLastCoaKebutuhan = RekeningCoa::where('kode_coa', 5)->where('sub_kode_coa', 500)->orderBy('id', 'desc')->first();
+ if ($getLastCoaKebutuhan == null) {
+ $getLastCoaKebutuhan = 1;
+ } else {
+ $getLastCoaKebutuhan = $getLastCoaKebutuhan->detail_coa + 1;
+ }
return view('pages.admin.pengeluaran.index', compact('coaBiaya', 'rekeningCoaTf', 'coaPengeluaran', 'distributors', 'satuans', 'getLastCoaKebutuhan'));
}
diff --git a/database/seeders/data_csv/produk.csv b/database/seeders/data_csv/produk.csv
index 64baf54..15d581c 100644
--- a/database/seeders/data_csv/produk.csv
+++ b/database/seeders/data_csv/produk.csv
@@ -1,60 +1,60 @@
id,kategori_produk_id,kode_produk,nama_produk,varian_produk,deskripsi_produk,harga_produk,stok_produk,tgl_start_promo,tgl_end_promo,stok_promo,tersedia,gambar_produk,urutan
-1,1,T.A REG,Telur Ayam Regular,,,0,,,,,,,11
-2,1,T.A SPE,Telur Ayam Spesial,,,0,,,,,,,11
-3,1,T.A ISTIMEWA,Telur Ayam Istimewa,,,48000,,,,,,,11
-4,1,T.B REG,Telur Bebek Regular,,,0,,,,,,,11
-5,1,T.B SPE,Telur Bebek Spesial,,,0,,,,,,,11
-6,1,T.B ISTIMEWA,Telur Bebek Istimewa,,,53000,,,,,,,11
+1,1,T.A REG,Martabak T. Ayam Regular,,,0,,,,,,,11
+2,1,T.A SPE,Martabak T. Ayam Spesial,,,0,,,,,,,11
+3,1,T.A ISTIMEWA,Martabak T. Ayam Istimewa,,,48000,,,,,,,11
+4,1,T.B REG,Martabak T. Bebek Regular,,,0,,,,,,,11
+5,1,T.B SPE,Martabak T. Bebek Spesial,,,0,,,,,,,11
+6,1,T.B ISTIMEWA,Martabak T. Bebek Istimewa,,,53000,,,,,,,11
7,1,SOSIS,Sosis,,,0,,,,,,,12
8,1,CORNED,Corned,,,0,,,,,,,12
9,1,DAGING AYAM,Daging Ayam,,,0,,,,,,,12
10,1,JAMUR,Jamur,,,0,,,,,,,12
11,1,TUNA,Tuna,,,0,,,,,,,12
12,1,DAGING SAPI,Daging Sapi,,,0,,,,,,,12
-13,1,T.A REG SOSIS,Telur Ayam Regular Sosis,,,20000,,,,,,,
-14,1,T.A REG CORNED,Telur Ayam Regular Corned,,,20000,,,,,,,
-15,1,T.A REG DAGING AYAM,Telur Ayam Regular Daging Ayam,,,22000,,,,,,,
-16,1,T.A REG JAMUR,Telur Ayam Regular Jamur,,,22000,,,,,,,
-17,1,T.A REG TUNA,Telur Ayam Regular Tuna,,,24000,,,,,,,
-18,1,T.A REG DAGING SAPI,Telur Ayam Regular Daging Sapi,,,27000,,,,,,,
-19,1,T.A SPE SOSIS,Telur Ayam Spesial Sosis,,,24000,,,,,,,
-20,1,T.A SPE CORNED,Telur Ayam Spesial Corned,,,24000,,,,,,,
-21,1,T.A SPE DAGING AYAM,Telur Ayam Spesial Daging Ayam,,,26000,,,,,,,
-22,1,T.A SPE JAMUR,Telur Ayam Spesial Jamur,,,26000,,,,,,,
-23,1,T.A SPE TUNA,Telur Ayam Spesial Tuna,,,28000,,,,,,,
-24,1,T.A SPE DAGING SAPI,Telur Ayam Spesial Daging Sapi,,,31000,,,,,,,
-25,1,T.B REG SOSIS,Telur Bebek Regular Sosis,,,24000,,,,,,,
-26,1,T.B REG CORNED,Telur Bebek Regular Corned,,,24000,,,,,,,
-27,1,T.B REG DAGING AYAM,Telur Bebek Regular Daging Ayam,,,26000,,,,,,,
-28,1,T.B REG JAMUR,Telur Bebek Regular Jamur,,,26000,,,,,,,
-29,1,T.B REG TUNA,Telur Bebek Regular Tuna,,,28000,,,,,,,
-30,1,T.B REG DAGING SAPI,Telur Bebek Regular Daging Sapi,,,31000,,,,,,,
-31,1,T.B SPE SOSIS,Telur Bebek Spesial Sosis,,,28000,,,,,,,
-32,1,T.B SPE CORNED,Telur Bebek Spesial Corned,,,28000,,,,,,,
-33,1,T.B SPE DAGING AYAM,Telur Bebek Spesial Daging Ayam,,,30000,,,,,,,
-34,1,T.B SPE JAMUR,Telur Bebek Spesial Jamur,,,30000,,,,,,,
-35,1,T.B SPE TUNA,Telur Bebek Spesial Tuna,,,32000,,,,,,,
-36,1,T.B SPE DAGING SAPI,Telur Bebek Spesial Daging Sapi,,,35000,,,,,,,
+13,1,T.A REG SOSIS,Martabak T. Ayam Regular Sosis,,,20000,,,,,,,
+14,1,T.A REG CORNED,Martabak T. Ayam Regular Corned,,,20000,,,,,,,
+15,1,T.A REG DAGING AYAM,Martabak T. Ayam Regular Daging Ayam,,,22000,,,,,,,
+16,1,T.A REG JAMUR,Martabak T. Ayam Regular Jamur,,,22000,,,,,,,
+17,1,T.A REG TUNA,Martabak T. Ayam Regular Tuna,,,24000,,,,,,,
+18,1,T.A REG DAGING SAPI,Martabak T. Ayam Regular Daging Sapi,,,27000,,,,,,,
+19,1,T.A SPE SOSIS,Martabak T. Ayam Spesial Sosis,,,24000,,,,,,,
+20,1,T.A SPE CORNED,Martabak T. Ayam Spesial Corned,,,24000,,,,,,,
+21,1,T.A SPE DAGING AYAM,Martabak T. Ayam Spesial Daging Ayam,,,26000,,,,,,,
+22,1,T.A SPE JAMUR,Martabak T. Ayam Spesial Jamur,,,26000,,,,,,,
+23,1,T.A SPE TUNA,Martabak T. Ayam Spesial Tuna,,,28000,,,,,,,
+24,1,T.A SPE DAGING SAPI,Martabak T. Ayam Spesial Daging Sapi,,,31000,,,,,,,
+25,1,T.B REG SOSIS,Martabak T. Bebek Regular Sosis,,,24000,,,,,,,
+26,1,T.B REG CORNED,Martabak T. Bebek Regular Corned,,,24000,,,,,,,
+27,1,T.B REG DAGING AYAM,Martabak T. Bebek Regular Daging Ayam,,,26000,,,,,,,
+28,1,T.B REG JAMUR,Martabak T. Bebek Regular Jamur,,,26000,,,,,,,
+29,1,T.B REG TUNA,Martabak T. Bebek Regular Tuna,,,28000,,,,,,,
+30,1,T.B REG DAGING SAPI,Martabak T. Bebek Regular Daging Sapi,,,31000,,,,,,,
+31,1,T.B SPE SOSIS,Martabak T. Bebek Spesial Sosis,,,28000,,,,,,,
+32,1,T.B SPE CORNED,Martabak T. Bebek Spesial Corned,,,28000,,,,,,,
+33,1,T.B SPE DAGING AYAM,Martabak T. Bebek Spesial Daging Ayam,,,30000,,,,,,,
+34,1,T.B SPE JAMUR,Martabak T. Bebek Spesial Jamur,,,30000,,,,,,,
+35,1,T.B SPE TUNA,Martabak T. Bebek Spesial Tuna,,,32000,,,,,,,
+36,1,T.B SPE DAGING SAPI,Martabak T. Bebek Spesial Daging Sapi,,,35000,,,,,,,
37,1,MOZARELLA,Mozarella,,,22000,,,,,,,13
38,1,KEJU,Keju,,,6000,,,,,,,13
39,1,T.B,Telur Bebek,,,3000,,,,,,,13
40,1,T.A,Telur Ayam,,,2000,,,,,,,13
-41,1,T.A REG MIX 2,Telur Ayam Regular Mix 2 Rasa,,,31000,,,,,,,
-42,1,T.A SPE MIX 2,Telur Ayam Spesial Mix 2 Rasa,,,36000,,,,,,,
-43,1,T.B REG MIX 2,Telur Bebek Regular Mix 2 Rasa,,,35000,,,,,,,
-44,1,T.B SPE MIX 2,Telur Bebek Spesial Mix 2 Rasa,,,40000,,,,,,,
-45,1,T.A REG MIX 3,Telur Ayam Regular Mix 3 Rasa,,,36000,,,,,,,
-46,1,T.A SPE MIX 3,Telur Ayam Spesial Mix 3 Rasa,,,41000,,,,,,,
-47,1,T.B REG MIX 3,Telur Bebek Regular Mix 3 Rasa,,,40000,,,,,,,
-48,1,T.B SPE MIX 3,Telur Bebek Spesial Mix 3 Rasa,,,45000,,,,,,,
-49,2,ORIGINAL,Original,,,19000,,,,,,,21
-50,2,PANDAN,Pandan,,,21000,,,,,,,21
-51,2,CHOCOLATE,Chocolate,,,21000,,,,,,,21
-52,2,CHARCOAL,Charcoal,,,22000,,,,,,,21
-53,2,RED VELVET,Red Velvet,,,22000,,,,,,,21
-54,2,BLACK FOREST,Black Forest,,,22000,,,,,,,21
-55,2,GREENTEA,Greentea,,,22000,,,,,,,21
-56,2,TARO,Taro,,,22000,,,,,,,21
+41,1,T.A REG MIX 2,Martabak T. Ayam Regular Mix 2 Rasa,,,31000,,,,,,,
+42,1,T.A SPE MIX 2,Martabak T. Ayam Spesial Mix 2 Rasa,,,36000,,,,,,,
+43,1,T.B REG MIX 2,Martabak T. Bebek Regular Mix 2 Rasa,,,35000,,,,,,,
+44,1,T.B SPE MIX 2,Martabak T. Bebek Spesial Mix 2 Rasa,,,40000,,,,,,,
+45,1,T.A REG MIX 3,Martabak T. Ayam Regular Mix 3 Rasa,,,36000,,,,,,,
+46,1,T.A SPE MIX 3,Martabak T. Ayam Spesial Mix 3 Rasa,,,41000,,,,,,,
+47,1,T.B REG MIX 3,Martabak T. Bebek Regular Mix 3 Rasa,,,40000,,,,,,,
+48,1,T.B SPE MIX 3,Martabak T. Bebek Spesial Mix 3 Rasa,,,45000,,,,,,,
+49,2,ORIGINAL,Terbul Original,,,19000,,,,,,,21
+50,2,PANDAN,Terbul Pandan,,,21000,,,,,,,21
+51,2,CHOCOLATE,Terbul Chocolate,,,21000,,,,,,,21
+52,2,CHARCOAL,Terbul Charcoal,,,22000,,,,,,,21
+53,2,RED VELVET,Terbul Red Velvet,,,22000,,,,,,,21
+54,2,BLACK FOREST,Terbul Black Forest,,,22000,,,,,,,21
+55,2,GREENTEA,Terbul Greentea,,,22000,,,,,,,21
+56,2,TARO,Terbul Taro,,,22000,,,,,,,21
57,2,REGULAR,Terbul 8 Rasa Regular,,,42000,,,,,,,22
58,2,PREMIUM,Terbul 8 Rasa Premium,,,70000,,,,,,,22
59,2,MESES,Tipker Meses,,,21000,,,,,,,23
@@ -63,7 +63,7 @@ id,kategori_produk_id,kode_produk,nama_produk,varian_produk,deskripsi_produk,har
62,2,KEJU MESES KACANG,Tipker Keju Meses Kacang,,,27000,,,,,,,23
63,2,XTRASUSU,Xtrasusu,,,2500,,,,,,,24
64,2,WIJEN,Wijen,,,3000,,,,,,,24
-65,2,PISAN,Pisan,,,3000,,,,,,,24
+65,2,PISANG,Pisang,,,3000,,,,,,,24
66,2,KACANG,Kacang,,,3500,,,,,,,24
67,2,BLUEBERRY,Blueberry,,,3500,,,,,,,24
68,2,STRAWBERRY,Strawberry,,,3500,,,,,,,24
@@ -92,107 +92,107 @@ id,kategori_produk_id,kode_produk,nama_produk,varian_produk,deskripsi_produk,har
91,2,TOBLERONE,Toblerone,,,40000,,,,,,,25
92,2,LOTUS BISCOFF,Lotus Biscoff,,,40000,,,,,,,25
93,2,OVOMALTINE,Ovomaltine,,,42000,,,,,,,25
-94,2,ORIGINAL BENG BENG,Original Beng Beng,,,30000,,,,,,,
-95,2,ORIGINAL MILO,Original Milo,,,31000,,,,,,,
-96,2,ORIGINAL OREO,Original Oreo,,,32000,,,,,,,
-97,2,ORIGINAL CHOCOMALTINE,Original Chocomaltine,,,33000,,,,,,,
-98,2,ORIGINAL DURIAN,Original Durian,,,34000,,,,,,,
-99,2,ORIGINAL CADBURRY,Original Cadburry,,,36000,,,,,,,
-100,2,ORIGINAL SILVERQUEEN,Original Silverqueen,,,39000,,,,,,,
-101,2,ORIGINAL KITKAT CHOCOLATE,Original Kitkat Chocolate,,,39000,,,,,,,
-102,2,ORIGINAL KITKAT GREENTEA,Original Kitkat Greentea,,,40000,,,,,,,
-103,2,ORIGINAL NUTELA,Original Nutela,,,40000,,,,,,,
-104,2,ORIGINAL TOBLERONE,Original Toblerone,,,40000,,,,,,,
-105,2,ORIGINAL LOTUS BISCOFF,Original Lotus Biscoff,,,40000,,,,,,,
-106,2,ORIGINAL OVOMALTINE,Original Ovomaltine,,,42000,,,,,,,
-107,2,PANDAN BENG BENG,Pandan Beng Beng,,,30000,,,,,,,
-108,2,PANDAN MILO,Pandan Milo,,,31000,,,,,,,
-109,2,PANDAN OREO,Pandan Oreo,,,32000,,,,,,,
-110,2,PANDAN CHOCOMALTINE,Pandan Chocomaltine,,,33000,,,,,,,
-111,2,PANDAN DURIAN,Pandan Durian,,,34000,,,,,,,
-112,2,PANDAN CADBURRY,Pandan Cadburry,,,36000,,,,,,,
-113,2,PANDAN SILVERQUEEN,Pandan Silverqueen,,,39000,,,,,,,
-114,2,PANDAN KITKAT CHOCOLATE,Pandan Kitkat Chocolate,,,39000,,,,,,,
-115,2,PANDAN KITKAT GREENTEA,Pandan Kitkat Greentea,,,40000,,,,,,,
-116,2,PANDAN NUTELA,Pandan Nutela,,,40000,,,,,,,
-117,2,PANDAN TOBLERONE,Pandan Toblerone,,,40000,,,,,,,
-118,2,PANDAN LOTUS BISCOFF,Pandan Lotus Biscoff,,,40000,,,,,,,
-119,2,PANDAN OVOMALTINE,Pandan Ovomaltine,,,42000,,,,,,,
-120,2,CHOCOLATE BENG BENG,Chocolate Beng Beng,,,30000,,,,,,,
-121,2,CHOCOLATE MILO,Chocolate Milo,,,31000,,,,,,,
-122,2,CHOCOLATE OREO,Chocolate Oreo,,,32000,,,,,,,
-123,2,CHOCOLATE CHOCOMALTINE,Chocolate Chocomaltine,,,33000,,,,,,,
-124,2,CHOCOLATE DURIAN,Chocolate Durian,,,34000,,,,,,,
-125,2,CHOCOLATE CADBURRY,Chocolate Cadburry,,,36000,,,,,,,
-126,2,CHOCOLATE SILVERQUEEN,Chocolate Silverqueen,,,39000,,,,,,,
-127,2,CHOCOLATE KITKAT CHOCOLATE,Chocolate Kitkat Chocolate,,,39000,,,,,,,
-128,2,CHOCOLATE KITKAT GREENTEA,Chocolate Kitkat Greentea,,,40000,,,,,,,
-129,2,CHOCOLATE NUTELA,Chocolate Nutela,,,40000,,,,,,,
-130,2,CHOCOLATE TOBLERONE,Chocolate Toblerone,,,40000,,,,,,,
-131,2,CHOCOLATE LOTUS BISCOFF,Chocolate Lotus Biscoff,,,40000,,,,,,,
-132,2,CHOCOLATE OVOMALTINE,Chocolate Ovomaltine,,,42000,,,,,,,
-133,2,CHARCOAL BENG BENG,Charcoal Beng Beng,,,30000,,,,,,,
-134,2,CHARCOAL MILO,Charcoal Milo,,,31000,,,,,,,
-135,2,CHARCOAL OREO,Charcoal Oreo,,,32000,,,,,,,
-136,2,CHARCOAL CHOCOMALTINE,Charcoal Chocomaltine,,,33000,,,,,,,
-137,2,CHARCOAL DURIAN,Charcoal Durian,,,34000,,,,,,,
-138,2,CHARCOAL CADBURRY,Charcoal Cadburry,,,36000,,,,,,,
-139,2,CHARCOAL SILVERQUEEN,Charcoal Silverqueen,,,39000,,,,,,,
-140,2,CHARCOAL KITKAT CHOCOLATE,Charcoal Kitkat Chocolate,,,39000,,,,,,,
-141,2,CHARCOAL KITKAT GREENTEA,Charcoal Kitkat Greentea,,,40000,,,,,,,
-142,2,CHARCOAL NUTELA,Charcoal Nutela,,,40000,,,,,,,
-143,2,CHARCOAL TOBLERONE,Charcoal Toblerone,,,40000,,,,,,,
-144,2,CHARCOAL LOTUS BISCOFF,Charcoal Lotus Biscoff,,,40000,,,,,,,
-145,2,CHARCOAL OVOMALTINE,Charcoal Ovomaltine,,,42000,,,,,,,
-146,2,RED VELVET BENG BENG,Red Velvet Beng Beng,,,30000,,,,,,,
-147,2,RED VELVET MILO,Red Velvet Milo,,,31000,,,,,,,
-148,2,RED VELVET OREO,Red Velvet Oreo,,,32000,,,,,,,
-149,2,RED VELVET CHOCOMALTINE,Red Velvet Chocomaltine,,,33000,,,,,,,
-150,2,RED VELVET DURIAN,Red Velvet Durian,,,34000,,,,,,,
-151,2,RED VELVET CADBURRY,Red Velvet Cadburry,,,36000,,,,,,,
-152,2,RED VELVET SILVERQUEEN,Red Velvet Silverqueen,,,39000,,,,,,,
-153,2,RED VELVET KITKAT CHOCOLATE,Red Velvet Kitkat Chocolate,,,39000,,,,,,,
-154,2,RED VELVET KITKAT GREENTEA,Red Velvet Kitkat Greentea,,,40000,,,,,,,
-155,2,RED VELVET NUTELA,Red Velvet Nutela,,,40000,,,,,,,
-156,2,RED VELVET TOBLERONE,Red Velvet Toblerone,,,40000,,,,,,,
-157,2,RED VELVET LOTUS BISCOFF,Red Velvet Lotus Biscoff,,,40000,,,,,,,
-158,2,RED VELVET OVOMALTINE,Red Velvet Ovomaltine,,,42000,,,,,,,
-159,2,BLACK FOREST BENG BENG,Black Forest Beng Beng,,,30000,,,,,,,
-160,2,BLACK FOREST MILO,Black Forest Milo,,,31000,,,,,,,
-161,2,BLACK FOREST OREO,Black Forest Oreo,,,32000,,,,,,,
-162,2,BLACK FOREST CHOCOMALTINE,Black Forest Chocomaltine,,,33000,,,,,,,
-163,2,BLACK FOREST DURIAN,Black Forest Durian,,,34000,,,,,,,
-164,2,BLACK FOREST CADBURRY,Black Forest Cadburry,,,36000,,,,,,,
-165,2,BLACK FOREST SILVERQUEEN,Black Forest Silverqueen,,,39000,,,,,,,
-166,2,BLACK FOREST KITKAT CHOCOLATE,Black Forest Kitkat Chocolate,,,39000,,,,,,,
-167,2,BLACK FOREST KITKAT GREENTEA,Black Forest Kitkat Greentea,,,40000,,,,,,,
-168,2,BLACK FOREST NUTELA,Black Forest Nutela,,,40000,,,,,,,
-169,2,BLACK FOREST TOBLERONE,Black Forest Toblerone,,,40000,,,,,,,
-170,2,BLACK FOREST LOTUS BISCOFF,Black Forest Lotus Biscoff,,,40000,,,,,,,
-171,2,BLACK FOREST OVOMALTINE,Black Forest Ovomaltine,,,42000,,,,,,,
-172,2,GREENTEA BENG BENG,Greentea Beng Beng,,,30000,,,,,,,
-173,2,GREENTEA MILO,Greentea Milo,,,31000,,,,,,,
-174,2,GREENTEA OREO,Greentea Oreo,,,32000,,,,,,,
-175,2,GREENTEA CHOCOMALTINE,Greentea Chocomaltine,,,33000,,,,,,,
-176,2,GREENTEA DURIAN,Greentea Durian,,,34000,,,,,,,
-177,2,GREENTEA CADBURRY,Greentea Cadburry,,,36000,,,,,,,
-178,2,GREENTEA SILVERQUEEN,Greentea Silverqueen,,,39000,,,,,,,
-179,2,GREENTEA KITKAT CHOCOLATE,Greentea Kitkat Chocolate,,,39000,,,,,,,
-180,2,GREENTEA KITKAT GREENTEA,Greentea Kitkat Greentea,,,40000,,,,,,,
-181,2,GREENTEA NUTELA,Greentea Nutela,,,40000,,,,,,,
-182,2,GREENTEA TOBLERONE,Greentea Toblerone,,,40000,,,,,,,
-183,2,GREENTEA LOTUS BISCOFF,Greentea Lotus Biscoff,,,40000,,,,,,,
-184,2,GREENTEA OVOMALTINE,Greentea Ovomaltine,,,42000,,,,,,,
-185,2,TARO BENG BENG,Taro Beng Beng,,,30000,,,,,,,
-186,2,TARO MILO,Taro Milo,,,31000,,,,,,,
-187,2,TARO OREO,Taro Oreo,,,32000,,,,,,,
-188,2,TARO CHOCOMALTINE,Taro Chocomaltine,,,33000,,,,,,,
-189,2,TARO DURIAN,Taro Durian,,,34000,,,,,,,
-190,2,TARO CADBURRY,Taro Cadburry,,,36000,,,,,,,
-191,2,TARO SILVERQUEEN,Taro Silverqueen,,,39000,,,,,,,
-192,2,TARO KITKAT CHOCOLATE,Taro Kitkat Chocolate,,,39000,,,,,,,
-193,2,TARO KITKAT GREENTEA,Taro Kitkat Greentea,,,40000,,,,,,,
-194,2,TARO NUTELA,Taro Nutela,,,40000,,,,,,,
-195,2,TARO TOBLERONE,Taro Toblerone,,,40000,,,,,,,
-196,2,TARO LOTUS BISCOFF,Taro Lotus Biscoff,,,40000,,,,,,,
-197,2,TARO OVOMALTINE,Taro Ovomaltine,,,42000,,,,,,,
+94,2,ORIGINAL BENG BENG,Terbul Original Beng Beng,,,30000,,,,,,,
+95,2,ORIGINAL MILO,Terbul Original Milo,,,31000,,,,,,,
+96,2,ORIGINAL OREO,Terbul Original Oreo,,,32000,,,,,,,
+97,2,ORIGINAL CHOCOMALTINE,Terbul Original Chocomaltine,,,33000,,,,,,,
+98,2,ORIGINAL DURIAN,Terbul Original Durian,,,34000,,,,,,,
+99,2,ORIGINAL CADBURRY,Terbul Original Cadburry,,,36000,,,,,,,
+100,2,ORIGINAL SILVERQUEEN,Terbul Original Silverqueen,,,39000,,,,,,,
+101,2,ORIGINAL KITKAT CHOCOLATE,Terbul Original Kitkat Chocolate,,,39000,,,,,,,
+102,2,ORIGINAL KITKAT GREENTEA,Terbul Original Kitkat Greentea,,,40000,,,,,,,
+103,2,ORIGINAL NUTELA,Terbul Original Nutela,,,40000,,,,,,,
+104,2,ORIGINAL TOBLERONE,Terbul Original Toblerone,,,40000,,,,,,,
+105,2,ORIGINAL LOTUS BISCOFF,Terbul Original Lotus Biscoff,,,40000,,,,,,,
+106,2,ORIGINAL OVOMALTINE,Terbul Original Ovomaltine,,,42000,,,,,,,
+107,2,PANDAN BENG BENG,Terbul Pandan Beng Beng,,,30000,,,,,,,
+108,2,PANDAN MILO,Terbul Pandan Milo,,,31000,,,,,,,
+109,2,PANDAN OREO,Terbul Pandan Oreo,,,32000,,,,,,,
+110,2,PANDAN CHOCOMALTINE,Terbul Pandan Chocomaltine,,,33000,,,,,,,
+111,2,PANDAN DURIAN,Terbul Pandan Durian,,,34000,,,,,,,
+112,2,PANDAN CADBURRY,Terbul Pandan Cadburry,,,36000,,,,,,,
+113,2,PANDAN SILVERQUEEN,Terbul Pandan Silverqueen,,,39000,,,,,,,
+114,2,PANDAN KITKAT CHOCOLATE,Terbul Pandan Kitkat Chocolate,,,39000,,,,,,,
+115,2,PANDAN KITKAT GREENTEA,Terbul Pandan Kitkat Greentea,,,40000,,,,,,,
+116,2,PANDAN NUTELA,Terbul Pandan Nutela,,,40000,,,,,,,
+117,2,PANDAN TOBLERONE,Terbul Pandan Toblerone,,,40000,,,,,,,
+118,2,PANDAN LOTUS BISCOFF,Terbul Pandan Lotus Biscoff,,,40000,,,,,,,
+119,2,PANDAN OVOMALTINE,Terbul Pandan Ovomaltine,,,42000,,,,,,,
+120,2,CHOCOLATE BENG BENG,Terbul Chocolate Beng Beng,,,30000,,,,,,,
+121,2,CHOCOLATE MILO,Terbul Chocolate Milo,,,31000,,,,,,,
+122,2,CHOCOLATE OREO,Terbul Chocolate Oreo,,,32000,,,,,,,
+123,2,CHOCOLATE CHOCOMALTINE,Terbul Chocolate Chocomaltine,,,33000,,,,,,,
+124,2,CHOCOLATE DURIAN,Terbul Chocolate Durian,,,34000,,,,,,,
+125,2,CHOCOLATE CADBURRY,Terbul Chocolate Cadburry,,,36000,,,,,,,
+126,2,CHOCOLATE SILVERQUEEN,Terbul Chocolate Silverqueen,,,39000,,,,,,,
+127,2,CHOCOLATE KITKAT CHOCOLATE,Terbul Chocolate Kitkat Chocolate,,,39000,,,,,,,
+128,2,CHOCOLATE KITKAT GREENTEA,Terbul Chocolate Kitkat Greentea,,,40000,,,,,,,
+129,2,CHOCOLATE NUTELA,Terbul Chocolate Nutela,,,40000,,,,,,,
+130,2,CHOCOLATE TOBLERONE,Terbul Chocolate Toblerone,,,40000,,,,,,,
+131,2,CHOCOLATE LOTUS BISCOFF,Terbul Chocolate Lotus Biscoff,,,40000,,,,,,,
+132,2,CHOCOLATE OVOMALTINE,Terbul Chocolate Ovomaltine,,,42000,,,,,,,
+133,2,CHARCOAL BENG BENG,Terbul Charcoal Beng Beng,,,30000,,,,,,,
+134,2,CHARCOAL MILO,Terbul Charcoal Milo,,,31000,,,,,,,
+135,2,CHARCOAL OREO,Terbul Charcoal Oreo,,,32000,,,,,,,
+136,2,CHARCOAL CHOCOMALTINE,Terbul Charcoal Chocomaltine,,,33000,,,,,,,
+137,2,CHARCOAL DURIAN,Terbul Charcoal Durian,,,34000,,,,,,,
+138,2,CHARCOAL CADBURRY,Terbul Charcoal Cadburry,,,36000,,,,,,,
+139,2,CHARCOAL SILVERQUEEN,Terbul Charcoal Silverqueen,,,39000,,,,,,,
+140,2,CHARCOAL KITKAT CHOCOLATE,Terbul Charcoal Kitkat Chocolate,,,39000,,,,,,,
+141,2,CHARCOAL KITKAT GREENTEA,Terbul Charcoal Kitkat Greentea,,,40000,,,,,,,
+142,2,CHARCOAL NUTELA,Terbul Charcoal Nutela,,,40000,,,,,,,
+143,2,CHARCOAL TOBLERONE,Terbul Charcoal Toblerone,,,40000,,,,,,,
+144,2,CHARCOAL LOTUS BISCOFF,Terbul Charcoal Lotus Biscoff,,,40000,,,,,,,
+145,2,CHARCOAL OVOMALTINE,Terbul Charcoal Ovomaltine,,,42000,,,,,,,
+146,2,RED VELVET BENG BENG,Terbul Red Velvet Beng Beng,,,30000,,,,,,,
+147,2,RED VELVET MILO,Terbul Red Velvet Milo,,,31000,,,,,,,
+148,2,RED VELVET OREO,Terbul Red Velvet Oreo,,,32000,,,,,,,
+149,2,RED VELVET CHOCOMALTINE,Terbul Red Velvet Chocomaltine,,,33000,,,,,,,
+150,2,RED VELVET DURIAN,Terbul Red Velvet Durian,,,34000,,,,,,,
+151,2,RED VELVET CADBURRY,Terbul Red Velvet Cadburry,,,36000,,,,,,,
+152,2,RED VELVET SILVERQUEEN,Terbul Red Velvet Silverqueen,,,39000,,,,,,,
+153,2,RED VELVET KITKAT CHOCOLATE,Terbul Red Velvet Kitkat Chocolate,,,39000,,,,,,,
+154,2,RED VELVET KITKAT GREENTEA,Terbul Red Velvet Kitkat Greentea,,,40000,,,,,,,
+155,2,RED VELVET NUTELA,Terbul Red Velvet Nutela,,,40000,,,,,,,
+156,2,RED VELVET TOBLERONE,Terbul Red Velvet Toblerone,,,40000,,,,,,,
+157,2,RED VELVET LOTUS BISCOFF,Terbul Red Velvet Lotus Biscoff,,,40000,,,,,,,
+158,2,RED VELVET OVOMALTINE,Terbul Red Velvet Ovomaltine,,,42000,,,,,,,
+159,2,BLACK FOREST BENG BENG,Terbul Black Forest Beng Beng,,,30000,,,,,,,
+160,2,BLACK FOREST MILO,Terbul Black Forest Milo,,,31000,,,,,,,
+161,2,BLACK FOREST OREO,Terbul Black Forest Oreo,,,32000,,,,,,,
+162,2,BLACK FOREST CHOCOMALTINE,Terbul Black Forest Chocomaltine,,,33000,,,,,,,
+163,2,BLACK FOREST DURIAN,Terbul Black Forest Durian,,,34000,,,,,,,
+164,2,BLACK FOREST CADBURRY,Terbul Black Forest Cadburry,,,36000,,,,,,,
+165,2,BLACK FOREST SILVERQUEEN,Terbul Black Forest Silverqueen,,,39000,,,,,,,
+166,2,BLACK FOREST KITKAT CHOCOLATE,Terbul Black Forest Kitkat Chocolate,,,39000,,,,,,,
+167,2,BLACK FOREST KITKAT GREENTEA,Terbul Black Forest Kitkat Greentea,,,40000,,,,,,,
+168,2,BLACK FOREST NUTELA,Terbul Black Forest Nutela,,,40000,,,,,,,
+169,2,BLACK FOREST TOBLERONE,Terbul Black Forest Toblerone,,,40000,,,,,,,
+170,2,BLACK FOREST LOTUS BISCOFF,Terbul Black Forest Lotus Biscoff,,,40000,,,,,,,
+171,2,BLACK FOREST OVOMALTINE,Terbul Black Forest Ovomaltine,,,42000,,,,,,,
+172,2,GREENTEA BENG BENG,Terbul Greentea Beng Beng,,,30000,,,,,,,
+173,2,GREENTEA MILO,Terbul Greentea Milo,,,31000,,,,,,,
+174,2,GREENTEA OREO,Terbul Greentea Oreo,,,32000,,,,,,,
+175,2,GREENTEA CHOCOMALTINE,Terbul Greentea Chocomaltine,,,33000,,,,,,,
+176,2,GREENTEA DURIAN,Terbul Greentea Durian,,,34000,,,,,,,
+177,2,GREENTEA CADBURRY,Terbul Greentea Cadburry,,,36000,,,,,,,
+178,2,GREENTEA SILVERQUEEN,Terbul Greentea Silverqueen,,,39000,,,,,,,
+179,2,GREENTEA KITKAT CHOCOLATE,Terbul Greentea Kitkat Chocolate,,,39000,,,,,,,
+180,2,GREENTEA KITKAT GREENTEA,Terbul Greentea Kitkat Greentea,,,40000,,,,,,,
+181,2,GREENTEA NUTELA,Terbul Greentea Nutela,,,40000,,,,,,,
+182,2,GREENTEA TOBLERONE,Terbul Greentea Toblerone,,,40000,,,,,,,
+183,2,GREENTEA LOTUS BISCOFF,Terbul Greentea Lotus Biscoff,,,40000,,,,,,,
+184,2,GREENTEA OVOMALTINE,Terbul Greentea Ovomaltine,,,42000,,,,,,,
+185,2,TARO BENG BENG,Terbul Taro Beng Beng,,,30000,,,,,,,
+186,2,TARO MILO,Terbul Taro Milo,,,31000,,,,,,,
+187,2,TARO OREO,Terbul Taro Oreo,,,32000,,,,,,,
+188,2,TARO CHOCOMALTINE,Terbul Taro Chocomaltine,,,33000,,,,,,,
+189,2,TARO DURIAN,Terbul Taro Durian,,,34000,,,,,,,
+190,2,TARO CADBURRY,Terbul Taro Cadburry,,,36000,,,,,,,
+191,2,TARO SILVERQUEEN,Terbul Taro Silverqueen,,,39000,,,,,,,
+192,2,TARO KITKAT CHOCOLATE,Terbul Taro Kitkat Chocolate,,,39000,,,,,,,
+193,2,TARO KITKAT GREENTEA,Terbul Taro Kitkat Greentea,,,40000,,,,,,,
+194,2,TARO NUTELA,Terbul Taro Nutela,,,40000,,,,,,,
+195,2,TARO TOBLERONE,Terbul Taro Toblerone,,,40000,,,,,,,
+196,2,TARO LOTUS BISCOFF,Terbul Taro Lotus Biscoff,,,40000,,,,,,,
+197,2,TARO OVOMALTINE,Terbul Taro Ovomaltine,,,42000,,,,,,,
diff --git a/resources/views/pages/Kasir/print.blade.php b/resources/views/pages/Kasir/print.blade.php
index 0032773..4f1d308 100644
--- a/resources/views/pages/Kasir/print.blade.php
+++ b/resources/views/pages/Kasir/print.blade.php
@@ -125,20 +125,23 @@
@foreach ($pesanan->detailPesanan as $item)
@if ($item->id_parent == null)
- |
+ |
{{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}
|
+
+ {{ convert_to_rupiah($item->total_harga_produk) }}
+ |
-
+ {{--
| {{ $item->jumlah_produk }} |
{{ convert_to_rupiah($item->harga_produk) }} |
{{ $item->diskon_persen != '' || $item->diskon_persen != 0 || $item->diskon_persen != null ? $item->diskon_persen . '%' : '' }}
|
- {{ convert_to_rupiah($item->harga_produk) }}
+ | {{ convert_to_rupiah($item->total_harga_produk) }}
|
-
+ --}}
@php
$tampungid = 0;
$historyController = new App\Http\Controllers\Kasir\History();
@@ -150,9 +153,9 @@
|
+ {{ $item2->jumlah }}x {{ $item2->nama_produk }} |
-
+ {{-- |
{{ convert_to_rupiah($item2->total) }}
- |
+ --}}
@endif
@endforeach
diff --git a/resources/views/pages/Kasir/print_dapur.blade.php b/resources/views/pages/Kasir/print_dapur.blade.php
index ea1d314..ff1dd69 100644
--- a/resources/views/pages/Kasir/print_dapur.blade.php
+++ b/resources/views/pages/Kasir/print_dapur.blade.php
@@ -133,20 +133,23 @@
@foreach ($pesanan->detailPesanan as $item)
@if ($item->id_parent == null)
- |
+ |
{{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}
|
+
+ {{ convert_to_rupiah($item->total_harga_produk) }}
+ |
-
+ {{--
| {{ $item->jumlah_produk }} |
{{ convert_to_rupiah($item->harga_produk) }} |
{{ $item->diskon_persen != '' || $item->diskon_persen != 0 || $item->diskon_persen != null ? $item->diskon_persen . '%' : '' }}
|
- {{ convert_to_rupiah($item->harga_produk) }}
+ | {{ convert_to_rupiah($item->total_harga_produk) }}
|
-
+ --}}
@php
$tampungid = 0;
$historyController = new App\Http\Controllers\Kasir\History();
@@ -158,9 +161,9 @@
|
+ {{ $item2->jumlah }}x {{ $item2->nama_produk }} |
-
+ {{-- |
{{ convert_to_rupiah($item2->total) }}
- |
+ --}}
@endif
@endforeach
diff --git a/resources/views/pages/admin/pengeluaran/modalkebutuhan.blade.php b/resources/views/pages/admin/pengeluaran/modalkebutuhan.blade.php
index 3754813..93258fe 100644
--- a/resources/views/pages/admin/pengeluaran/modalkebutuhan.blade.php
+++ b/resources/views/pages/admin/pengeluaran/modalkebutuhan.blade.php
@@ -81,7 +81,7 @@
+ value="{{ sprintf('%02d', $getLastCoaKebutuhan) }}">