@@ -299,7 +302,11 @@
$('#checkoutModal').modal('show');
$('#cathering_order_photo').attr('src', `/gambar/${el.data('foto') || 'default.jpg'}`);
- $('#cathering_order_name').text(el.data('nama_menu') || '-');
+
+ $('#cathering_order_name').html(`
+
${el.data('nama_menu')}
+ ${resultKkal}
+
`);
$('#cathering_order_menu_id').val(el.data('id'));
$('#cathering_order_jenis_menu').val(el.data('jenis_menu'));
$('#cathering_order_deskripsi').text(el.data('deskripsi') || '');
@@ -307,7 +314,6 @@
$('#cathering_order_price_public').text("Rp " + parseInt(el.data('harga_public') || 0).toLocaleString('id-ID'));
$('#tag_klasifikasi_menu').html(klasifikasiMenu);
$('#tgl_menu_tersedia').html(tglMenuTersedia);
- $('#kalori_menu').html(resultKkal);
$('#apakah_someday').val(someday ? 1 : 0);
$('#apakah_menu_siang').val(siang ? 1 : 0);
$('#apakah_menu_sore').val(sore ? 1 : 0);
@@ -348,7 +354,14 @@
let order_id = sessionStorage.getItem('order_id') || null;
if(order_id){
- window.location.href = '/checkout'
+ Swal.fire({
+ icon: 'warning',
+ title: 'Pesanan Belum Selesai',
+ text: 'Silakan selesaikan pesanan Anda terlebih dahulu sebelum melanjutkan.',
+ timer: 2500,
+ }).then(() => {
+ window.location.href = '/checkout';
+ });
}
let cart = JSON.parse(sessionStorage.getItem('cart') || '[]');
@@ -368,7 +381,8 @@
let namaMenu = $("#cathering_order_name").text();
- let existingItem = cart.find(item => item.id_menu === idMenu && item.nama_menu === namaMenu);
+ console.log(cart);
+ let existingItem = cart.find(item => item.id_menu === idMenu);
if(!existingItem){
const orderItem ={
@@ -405,7 +419,7 @@
let idMenu = $(e).data('id');
let namaMenu = $(e).data('nama_menu');
- let existingItem = cart.find(item => item.id_menu === idMenu && item.nama_menu === namaMenu);
+ let existingItem = cart.find(item => item.id_menu === idMenu);
if(existingItem){
orders.forEach(newOrder => {
const existingOrder =existingItem.pesanan.find(p => p.tgl === newOrder.tgl)
@@ -451,7 +465,14 @@
function handleClick(e){
const order_id = sessionStorage.getItem('order_id') || null;
if(order_id){
- window.location.href = '/checkout'
+ Swal.fire({
+ icon: 'warning',
+ title: 'Pesanan Belum Selesai',
+ text: 'Silakan selesaikan pesanan Anda terlebih dahulu sebelum melanjutkan.',
+ timer: 2500,
+ }).then(() => {
+ window.location.href = '/checkout';
+ });
}else{
saveItem(e)
}
diff --git a/public/js/pekerjaan/dt.js b/public/js/pekerjaan/dt.js
index 6d9497b..f81f692 100644
--- a/public/js/pekerjaan/dt.js
+++ b/public/js/pekerjaan/dt.js
@@ -1,5 +1,6 @@
function initDt(selectDate = []){
+ let selectedRows = [];
datatablePekerjaan.bootstrapTable('destroy');
datatablePekerjaan.bootstrapTable({
url: "/dashboard/datatable/pekerjaan",
@@ -20,13 +21,22 @@
pageSize: 10,
pageList: [10, 20, 30, 40, 50, 100, 200],
cookie: true,
- cookieIdTable: "table_rma_ssc_id",
+ cookieIdTable: "datatablePekerjaan",
icons: {
refresh: "fas fa-sync-alt", // atau ganti ke icon lain
columns: "fas fa-th-large"
},
columns: [
+ {
+ title: '
',
+ field: 'order_id',
+ align: 'center',
+ valign: 'middle',
+ formatter: function (value, row, index) {
+ return `
`
+ }
+ },
{
title: "Action",
field:'order_id',
@@ -114,6 +124,66 @@
],
});
+ $(document).on('click', '#selectAll', function () {
+ selectedRows = [];
+ const isChecked = this.checked;
+ $('.rowCheckbox').each(function () {
+ this.checked = isChecked;
+ let order_id = $(this).data('order_id');
+ if (isChecked) {
+ selectedRows.push({ order_id });
+ }
+ });
+ $('#buttonLabel').prop("disabled", !isChecked);
+ });
+
+ $(document).on('change', '.rowCheckbox', function () {
+ let order_id = $(this).data('order_id');
+ let isChecked = this.checked;
+ if (isChecked) {
+ if (!selectedRows.find(r => r.order_id === order_id)) {
+ selectedRows.push({ order_id });
+ }
+ } else {
+ selectedRows = selectedRows.filter(r => r.order_id !== order_id);
+ }
+ $('#buttonLabel').prop("disabled", selectedRows.length === 0);
+ });
+ window.getSelectedRowsForLabel = () => selectedRows;
}
+
+ function labelDownload(){
+ const selected = (typeof getSelectedRowsForLabel === 'function') ? getSelectedRowsForLabel() : [];
+
+ if (selected.length === 0) {
+ alert("Silakan pilih setidaknya satu item terlebih dahulu.");
+ return;
+ }
+
+ fetch('/dashboard/pekerjaan/label', {
+ method:'POST',
+ headers:{
+ 'Content-Type' : 'application/json',
+ 'X-CSRF-TOKEN': document.querySelector('input[name="_token"]').value,
+ },
+ body: JSON.stringify({ items : selected})
+ })
+ .then(response => {
+ if (!response.ok) throw new Error('Gagal download label');
+ return response.blob();
+
+ })
+ .then(res => {
+ console.log(res);
+
+ })
+ .catch(error => {
+ alert('gagal mengunduh');
+ console.error(error);
+
+ })
+
+
+ }
diff --git a/public/js/pesanan_pending/dt.js b/public/js/pesanan_pending/dt.js
index 181c77a..1bb0528 100644
--- a/public/js/pesanan_pending/dt.js
+++ b/public/js/pesanan_pending/dt.js
@@ -1,6 +1,13 @@
- datatablePending.bootstrapTable({
+ function initDt(selectDate = []){
+ datatablePending.bootstrapTable('destroy')
+ datatablePending.bootstrapTable({
url: "/dashboard/datatable/pending",
+ method:'get',
+ queryParams:function(params){
+ params.tanggal = selectDate;
+ return params;
+ },
showColumns: true,
showColumnsToggleAll: true,
showRefresh: true,
@@ -158,3 +165,38 @@
}
],
});
+ }
+
+ document.addEventListener('DOMContentLoaded', function () {
+ flatpickr('#tanggal', {
+ dateFormat: "Y-m-d",
+ mode: "multiple",
+ locale: "id", // opsional: agar hari/bulan dalam Bahasa Indonesia
+ onValueUpdate: function(selectedDates, dateStr, instance) {
+ const selectedFormattedDates = selectedDates.map(d => {
+ const year = d.getFullYear();
+ const month = String(d.getMonth() + 1).padStart(2, '0');
+ const day = String(d.getDate()).padStart(2, '0');
+ return `${year}-${month}-${day}`;
+ })
+ initDt(selectedFormattedDates)
+ if(selectedFormattedDates.length > 0){
+ const tanggalList = selectedFormattedDates;
+
+ let tanggalRapi = '';
+ if (tanggalList.length === 1) {
+ tanggalRapi = tanggalList[0];
+ } else if (tanggalList.length === 2) {
+ tanggalRapi = tanggalList.join(' dan ');
+ } else if (tanggalList.length > 2) {
+ tanggalRapi = tanggalList.slice(0, -1).join(', ') + ', dan ' + tanggalList.slice(-1);
+ }
+ $("#confirm_date_pesanan_pending").text(': ' + tanggalRapi)
+ }else{
+ $("#confirm_date_pesanan_pending").text('');
+ }
+ }
+ });
+ $("#confirm_date_pesanan_pending").text('Hari Ini');
+ initDt();
+ });
diff --git a/public/js/pesanan_selesai/dt.js b/public/js/pesanan_selesai/dt.js
index e4aa639..daf0452 100644
--- a/public/js/pesanan_selesai/dt.js
+++ b/public/js/pesanan_selesai/dt.js
@@ -1,139 +1,147 @@
+ function initDt(selectDate = []){
+ datatableSelesai.bootstrapTable('destroy')
+ datatableSelesai.bootstrapTable({
+ url: "/dashboard/datatable/selesai",
+ method:'get',
+ queryParams:function(params){
+ params.tanggal = selectDate;
+ return params;
+ },
+ showColumns: true,
+ showColumnsToggleAll: true,
+ showRefresh: true,
+ sortable: true,
+ search: true,
+ searchOnEnterKey: false,
+ searchHighlight: true,
+ pagination: true,
+ serverSide:true,
+ pageSize: 10,
+ pageList: [10, 20, 30, 40, 50, 100, 200],
+ cookie: true,
+ cookieIdTable: "table_rma_ssc_id",
+ icons: {
+ refresh: "fas fa-sync-alt", // atau ganti ke icon lain
+ columns: "fas fa-th-large"
+ },
- datatableSelesai.bootstrapTable({
- url: "/dashboard/datatable/selesai",
- showColumns: true,
- showColumnsToggleAll: true,
- showRefresh: true,
- sortable: true,
- search: true,
- searchOnEnterKey: false,
- searchHighlight: true,
- pagination: true,
- serverSide:true,
- pageSize: 10,
- pageList: [10, 20, 30, 40, 50, 100, 200],
- cookie: true,
- cookieIdTable: "table_rma_ssc_id",
- icons: {
- refresh: "fas fa-sync-alt", // atau ganti ke icon lain
- columns: "fas fa-th-large"
- },
+ columns: [
+ {
+ title: "Action",
+ field:'order_id',
+ formatter: function(value, row) {
+ let buttons = ''
+ if(row?.status_order === "Lunas"){
+ buttons += `
+
+ `
+ }
- columns: [
- {
- title: "Action",
- field:'order_id',
- formatter: function(value, row) {
- let buttons = ''
- if(row?.status_order === "Lunas"){
- buttons += `
-
- `
+ return `
+
+ ${buttons}
+
+ `;
}
+ },
+
+ {
+ title: "No.Order",
+ field: 'no_order',
+ sortable: true,
+ },
+ {
+ title: "Cara Pembayaran",
+ field: 'cara_pembayaran',
+ sortable: true,
+ },
+ {
+ title: "Status Pembayaran",
+ field: 'status_order',
+ sortable: true,
+ formatter: function(value, row) {
+ const status = value;
+ let badgeClass = 'bg-secondary';
+ if (status === "Belum Bayar") {
+ badgeClass = 'bg-warning text-dark';
+ } else if (status === "Menunggu Konfirmasi Pembayaran") {
+ badgeClass = 'bg-primary';
+ } else if (status === "Lunas" || status === "Sudah Bayar") {
+ badgeClass = 'bg-success text-dark';
+ } else if(status === "Dibatalkan"){
+ badgeClass = 'bg-danger';
+ }
+ return `
+
${status}
+ ${status === 'Dibatalkan' && row.note_dibatalkan ? `
+
+ ${row.note_dibatalkan}
+
+ ` : ''}
+ `;
+ }
+ },
+ {
+ title: "Status Pesanan",
+ formatter: function(value, row) {
+ const progress = parseInt(row.progress) || 0;
+ const total = row.total_detail || 0;
+ const selesai = row.selesai_detail || 0;
return `
-
- ${buttons}
+
+
+
${selesai} / ${total} selesai
`;
- }
- },
+ },
+ sortable: true,
+ },
+ {
+ title: "Pemesan",
+ field:'nama_pemesan',
+ sortable: true,
+ },
+ {
+ title: "Tgl Pemesanan",
+ field: 'entry_at',
+ formatter: function(value, row) {
+ if (!row?.entry_at) return '-';
- {
- title: "No.Order",
- field: 'no_order',
- sortable: true,
- },
- {
- title: "Cara Pembayaran",
- field: 'cara_pembayaran',
- sortable: true,
- },
- {
- title: "Status Pembayaran",
- field: 'status_order',
- sortable: true,
- formatter: function(value, row) {
- const status = value;
- let badgeClass = 'bg-secondary';
- if (status === "Belum Bayar") {
- badgeClass = 'bg-warning text-dark';
- } else if (status === "Menunggu Konfirmasi Pembayaran") {
- badgeClass = 'bg-primary';
- } else if (status === "Lunas" || status === "Sudah Bayar") {
- badgeClass = 'bg-success text-dark';
- } else if(status === "Dibatalkan"){
- badgeClass = 'bg-danger';
+ const date = new Date(row.entry_at);
+ return date.toLocaleString('id-ID', {
+ day: '2-digit',
+ month: 'short', // Bisa diganti 'long' kalau mau 'Juli' bukan 'Jul'
+ year: 'numeric',
+ hour: '2-digit',
+ minute: '2-digit',
+ hour12: false // pakai format 24 jam
+ });
+ },
+ sortable: true,
+ },
+ {
+ title: "Kategori Customer",
+ field: 'jenis_customer',
+ sortable: true,
+ },
+ {
+ title: "Total Harga Pesanan",
+ field:'total_harga',
+ formatter: function(value, row){
+ return 'Rp ' + parseInt(row.total_harga).toLocaleString('id-ID')
}
- return `
-
${status}
- ${status === 'Dibatalkan' && row.note_dibatalkan ? `
-
- ${row.note_dibatalkan}
-
- ` : ''}
- `;
}
- },
- {
- title: "Status Pesanan",
- formatter: function(value, row) {
- const progress = parseInt(row.progress) || 0;
- const total = row.total_detail || 0;
- const selesai = row.selesai_detail || 0;
- return `
-
-
-
${selesai} / ${total} selesai
-
- `;
- },
- sortable: true,
- },
- {
- title: "Pemesan",
- field:'nama_pemesan',
- sortable: true,
- },
- {
- title: "Tgl Pemesanan",
- field: 'entry_at',
- formatter: function(value, row) {
- if (!row?.entry_at) return '-';
-
- const date = new Date(row.entry_at);
- return date.toLocaleString('id-ID', {
- day: '2-digit',
- month: 'short', // Bisa diganti 'long' kalau mau 'Juli' bukan 'Jul'
- year: 'numeric',
- hour: '2-digit',
- minute: '2-digit',
- hour12: false // pakai format 24 jam
- });
- },
- sortable: true,
- },
- {
- title: "Kategori Customer",
- field: 'jenis_customer',
- sortable: true,
- },
- {
- title: "Total Harga Pesanan",
- field:'total_harga',
- formatter: function(value, row){
- return 'Rp ' + parseInt(row.total_harga).toLocaleString('id-ID')
- }
- }
-
- ],
+ ],
});
+ }
+
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index eca0236..487019d 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -91,6 +91,38 @@
diff --git a/resources/views/dashboard/master/menu/modal/edit.blade.php b/resources/views/dashboard/master/menu/modal/edit.blade.php
index cbe71e4..3104c57 100644
--- a/resources/views/dashboard/master/menu/modal/edit.blade.php
+++ b/resources/views/dashboard/master/menu/modal/edit.blade.php
@@ -51,6 +51,7 @@
+
@@ -76,7 +77,7 @@
+ 