diff --git a/app/Http/Controllers/Kasir/Transaksi.php b/app/Http/Controllers/Kasir/Transaksi.php index adedd8e..78c02e0 100644 --- a/app/Http/Controllers/Kasir/Transaksi.php +++ b/app/Http/Controllers/Kasir/Transaksi.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Kasir; use App\Http\Controllers\Controller; +use App\Jobs\ProcessPrint; use App\Models\BukuBesar; use App\Models\DetailPesanan; use App\Models\KelompokKategori; @@ -268,22 +269,26 @@ class Transaksi extends Controller } DB::commit(); - try { - $print = new PrintOutController(); - $print->print($pesananModels->id); - return redirect()->back()->with('success', 'Pesanan berhasil ditambahkan'); - // return ['url' => route('transaksi.print', $pesananModels->id) . '?print=true', 'message' => 'Pesanan berhasil ditambahkan']; - } catch (\Throwable $th) { - dd('Print Catch ', $th->getMessage(), $th->getLine(), $th->getFile()); - return redirect()->back()->with('error', 'Pesanan berhasil ditambahkan, tetapi terjadi kesalahan saat mencetak struk'); - } + // print struk + // try { + // $print = new PrintOutController(); + + // $print->print($pesananModels->id); + // return redirect()->back()->with('success', 'Pesanan berhasil ditambahkan'); + // // return ['url' => route('transaksi.print', $pesananModels->id) . '?print=true', 'message' => 'Pesanan berhasil ditambahkan']; + // } catch (\Throwable $th) { + // dd('Print Catch ', $th->getMessage(), $th->getLine(), $th->getFile()); + // return redirect()->back()->with('error', 'Pesanan berhasil ditambahkan, tetapi terjadi kesalahan saat mencetak struk'); + // } + + ProcessPrint::dispatch($pesananModels); // return url link page print - return redirect()->back()->with('success', 'Pesanan berhasil ditambahkan'); - // return ['url' => route('transaksi.print', $pesananModels->id) . '?print=true', 'message' => 'Pesanan berhasil ditambahkan']; + // return redirect()->back()->with('success', 'Pesanan berhasil ditambahkan'); + return ['url' => route('transaksi.print', $pesananModels->id) . '?print=true', 'message' => 'Pesanan berhasil ditambahkan']; } catch (\Throwable $th) { DB::rollBack(); - dd('Store Catch ', $th->getMessage(), $th->getLine()); + // dd('Store Catch ', $th->getMessage(), $th->getLine()); return redirect()->back()->with('error', 'Terjadi kesalahan'); } diff --git a/app/Http/Controllers/Kasir/kolomPrinter58mmController.php b/app/Http/Controllers/Kasir/kolomPrinter58mmController.php index c8aa858..e1d279e 100644 --- a/app/Http/Controllers/Kasir/kolomPrinter58mmController.php +++ b/app/Http/Controllers/Kasir/kolomPrinter58mmController.php @@ -138,7 +138,7 @@ class kolomPrinter58mmController extends Controller $items = []; /* Information for the receipt */ foreach ($pesanan->detailPesanan as $key => $value) { - $status_pesanan = $value->status_pesanan == 0 ? '(TAKEAWAY)' : ($value->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)'); + $status_pesanan = $value->status_pesanan == 0 ? '(TAKEAWAY)' : ($value->status_pesanan == 3 ? '(CANCEL)' : ''); $items[] = $this->buatBaris1Kolom('(' . $value->jumlah_produk . ') ' . $value->nama_produk . ' ' . $status_pesanan); if ($value->keterangan_produk != '') { $items[] = $this->buatBaris1Kolom('Ket: ' . $value->keterangan_produk); diff --git a/app/Http/Controllers/Kasir/kolomPrinter88mmController.php b/app/Http/Controllers/Kasir/kolomPrinter88mmController.php index 2d65a82..b34c095 100644 --- a/app/Http/Controllers/Kasir/kolomPrinter88mmController.php +++ b/app/Http/Controllers/Kasir/kolomPrinter88mmController.php @@ -139,7 +139,7 @@ class kolomPrinter88mmController extends Controller $items = []; /* Information for the receipt */ foreach ($pesanan->detailPesanan as $key => $value) { - $status_pesanan = $value->status_pesanan == 0 ? '(TAKEAWAY)' : ($value->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)'); + $status_pesanan = $value->status_pesanan == 0 ? '(TAKEAWAY)' : ($value->status_pesanan == 3 ? '(CANCEL)' : ''); $items[] = $this->buatBaris1Kolom('(' . $value->jumlah_produk . ') ' . $value->nama_produk . ' ' . $status_pesanan); if ($value->keterangan_produk != '') { $items[] = $this->buatBaris1Kolom('Ket: ' . $value->keterangan_produk); diff --git a/app/Jobs/ProcessPrint.php b/app/Jobs/ProcessPrint.php new file mode 100644 index 0000000..0392299 --- /dev/null +++ b/app/Jobs/ProcessPrint.php @@ -0,0 +1,44 @@ +pesanan = $pesanan; + } + + /** + * Execute the job. + */ + public function handle(): void + { + try { + $pesanan = Pesanan::find($this->pesanan->id); + Log::info('Printing: ' . $pesanan->id); + $print = new PrintOutController(); + + $print->print($pesanan->id); + Log::info('Printed: ' . $pesanan->id); + } catch (\Throwable $th) { + //throw $th; + Log::error($th->getMessage()); + } + } +} diff --git a/database/migrations/2024_03_05_130719_create_jobs_table.php b/database/migrations/2024_03_05_130719_create_jobs_table.php new file mode 100644 index 0000000..6098d9b --- /dev/null +++ b/database/migrations/2024_03_05_130719_create_jobs_table.php @@ -0,0 +1,32 @@ +bigIncrements('id'); + $table->string('queue')->index(); + $table->longText('payload'); + $table->unsignedTinyInteger('attempts'); + $table->unsignedInteger('reserved_at')->nullable(); + $table->unsignedInteger('available_at'); + $table->unsignedInteger('created_at'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('jobs'); + } +}; diff --git a/resources/views/pages/Kasir/js.blade.php b/resources/views/pages/Kasir/js.blade.php index 918456d..3b462dc 100644 --- a/resources/views/pages/Kasir/js.blade.php +++ b/resources/views/pages/Kasir/js.blade.php @@ -758,9 +758,11 @@ toastr.success(result.message, 'Success', { timeOut: 2000 }); - location.reload(); + // location.reload(); // window.open(result.url, '_blank'); - // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600"); + window.open(result.url, '_blank', + "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600" + ); // set localStorage.OrderStorage to null theInterval = false; @@ -882,9 +884,11 @@ toastr.success(result.message, 'Success', { timeOut: 2000 }); - location.reload(); + // location.reload(); // window.open(result.url, '_blank'); - // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600"); + window.open(result.url, '_blank', + "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600" + ); // set localStorage.OrderStorage to null theInterval = false; diff --git a/resources/views/pages/Kasir/print.blade.php b/resources/views/pages/Kasir/print.blade.php index 4bdc561..ec077be 100644 --- a/resources/views/pages/Kasir/print.blade.php +++ b/resources/views/pages/Kasir/print.blade.php @@ -122,7 +122,7 @@ @foreach ($pesanan->detailPesanan as $item) {{ $item->nama_produk }} - {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }} + {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }} @@ -213,7 +213,7 @@

({{ $item->jumlah_produk }} X) {{ $item->nama_produk }} - {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }} + {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}

@if ($item->keterangan_produk != '')

diff --git a/resources/views/pages/Kasir/print_dapur.blade.php b/resources/views/pages/Kasir/print_dapur.blade.php index fe34234..bc2c6f7 100644 --- a/resources/views/pages/Kasir/print_dapur.blade.php +++ b/resources/views/pages/Kasir/print_dapur.blade.php @@ -133,7 +133,7 @@ @foreach ($pesanan->detailPesanan as $item) - {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }} + {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }} @@ -224,7 +224,7 @@

({{ $item->jumlah_produk }} X) - {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }} + {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}

@if ($item->keterangan_produk != '')

diff --git a/resources/views/pages/Kasir/print_dapur_2x.blade.php b/resources/views/pages/Kasir/print_dapur_2x.blade.php index 8759bea..46d4172 100644 --- a/resources/views/pages/Kasir/print_dapur_2x.blade.php +++ b/resources/views/pages/Kasir/print_dapur_2x.blade.php @@ -126,7 +126,7 @@ ({{ $item->jumlah_produk }} X) - {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }} + {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }} @if ($item->keterangan_produk != '')

     ket: {{ $item->keterangan_produk }} diff --git a/resources/views/pages/Kasir/print_dapur_3x.blade.php b/resources/views/pages/Kasir/print_dapur_3x.blade.php index ae6fe9f..f60fa4a 100644 --- a/resources/views/pages/Kasir/print_dapur_3x.blade.php +++ b/resources/views/pages/Kasir/print_dapur_3x.blade.php @@ -127,7 +127,7 @@

({{ $item->jumlah_produk }} X) - {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }} + {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '') }}

@if ($item->keterangan_produk != '')