Merge pull request 'removed unwanted logic from pallet print controller' (#393) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 25s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 25s
Reviewed-on: #393
This commit was merged in pull request #393.
This commit is contained in:
@@ -7,6 +7,7 @@ use App\Models\Plant;
|
||||
use App\Models\WireMasterPacking;
|
||||
use Illuminate\Http\Request;
|
||||
use Barryvdh\DomPDF\Facade\Pdf;
|
||||
use SimpleSoftwareIO\QrCode\Facades\QrCode;
|
||||
|
||||
|
||||
class PalletPrintController extends Controller
|
||||
@@ -19,164 +20,256 @@ class PalletPrintController extends Controller
|
||||
//
|
||||
}
|
||||
|
||||
// public function print(Request $request, $pallet, $plant)
|
||||
// {
|
||||
|
||||
// $customerId = $request->query('customer');
|
||||
|
||||
// // $customerName = $request->query('customer_name');
|
||||
|
||||
// // $items = WireMasterPacking::with('item')
|
||||
// // ->where('plant_id', $plant)
|
||||
// // ->where('wire_packing_number', $pallet)
|
||||
// // ->get()
|
||||
// // ->groupBy('item_id')
|
||||
// // ->map(function ($rows) {
|
||||
// // $first = $rows->first();
|
||||
|
||||
// // return (object) [
|
||||
// // 'code' => $first->item->code,
|
||||
// // 'description' => $first->item->description,
|
||||
// // 'box_count' => $rows->count(),
|
||||
// // 'weight' => $rows->sum('weight'),
|
||||
// // ];
|
||||
// // })
|
||||
// // ->values();
|
||||
|
||||
// $items = WireMasterPacking::with('item')
|
||||
// ->where('plant_id', $plant)
|
||||
// ->where('wire_packing_number', $pallet)
|
||||
// ->get()
|
||||
// ->map(function ($row) {
|
||||
// return (object) [
|
||||
// 'code' => $row->item->code,
|
||||
// 'description' => $row->item->description,
|
||||
// 'box_count' => 1, // each row = one box
|
||||
// 'weight' => $row->weight,
|
||||
// ];
|
||||
// });
|
||||
|
||||
// $masterBox = WireMasterPacking::where('plant_id', $plant)
|
||||
// ->where('wire_packing_number', $pallet)
|
||||
// ->value('customer_po_master_id');
|
||||
|
||||
// $customer = CustomerPoMaster::find($masterBox);
|
||||
|
||||
// $customerCode = $customer->customer_po ?? '';
|
||||
// $customerName = $customer->customer_name ?? '';
|
||||
|
||||
// // $masterBox = WireMasterPacking::where('plant_id', $plant)
|
||||
// // ->where('wire_packing_number', $pallet)
|
||||
// // ->distinct('customer_po')
|
||||
// // ->count('customer_po');
|
||||
|
||||
// // $pallets = WireMasterPacking::where('plant_id', $plant)
|
||||
// // ->select('wire_packing_number', 'updated_at')
|
||||
// // ->distinct('wire_packing_number')
|
||||
// // ->orderBy('wire_packing_number')
|
||||
// // ->orderBy('updated_at', 'asc')
|
||||
// // ->get()
|
||||
// // ->pluck('wire_packing_number')
|
||||
// // ->values();
|
||||
|
||||
// // $currentPalletNo = $pallets->search($pallet) + 1;
|
||||
|
||||
// // $totalBoxes = WireMasterPacking::where('plant_id', $plant)
|
||||
// // // ->where('wire_packing_number', $pallet)
|
||||
// // ->distinct()
|
||||
// // ->count('customer_po');
|
||||
|
||||
// // $boxLabel = $currentPalletNo . '/' . $totalBoxes;
|
||||
|
||||
// $totalBoxes = WireMasterPacking::where('plant_id', $plant)
|
||||
// ->where('customer_po_master_id', $customerId)
|
||||
// ->distinct('wire_packing_number')
|
||||
// ->count('wire_packing_number');
|
||||
|
||||
// $completedPallets = WireMasterPacking::where('plant_id', $plant)
|
||||
// ->where('customer_po_master_id', $customerId)
|
||||
// ->select('wire_packing_number')
|
||||
// ->groupBy('wire_packing_number')
|
||||
// ->havingRaw(
|
||||
// 'COUNT(*) = COUNT(CASE WHEN wire_packing_status = ? THEN 1 END)',
|
||||
// ['Completed']
|
||||
// )
|
||||
// ->orderBy('wire_packing_number')
|
||||
// ->pluck('wire_packing_number')
|
||||
// ->values();
|
||||
|
||||
|
||||
// $index = $completedPallets->search($pallet);
|
||||
|
||||
// $currentPalletNo = ($index !== false) ? $index + 1 : 0;
|
||||
|
||||
// $boxLabel = $currentPalletNo . '/' . $totalBoxes;
|
||||
|
||||
// // $completedPallets = WireMasterPacking::where('plant_id', $plant)
|
||||
// // ->select('wire_packing_number')
|
||||
// // ->groupBy('wire_packing_number')
|
||||
// // ->havingRaw('COUNT(*) = COUNT(CASE WHEN wire_packing_status = ? THEN 1 END)', ['Completed'])
|
||||
// // ->orderBy('wire_packing_number')
|
||||
// // ->pluck('wire_packing_number')
|
||||
// // ->values();
|
||||
|
||||
// // $currentPalletNo = $completedPallets->search($pallet) != false
|
||||
// // ? $completedPallets->search($pallet) + 1
|
||||
// // : 0;
|
||||
|
||||
// // $boxLabel = $currentPalletNo . '/' . $totalBoxes;
|
||||
|
||||
// $grossWeight = $items->sum('weight');
|
||||
// $widthPt = 85 * 2.83465; // 85mm → points
|
||||
// $heightPt = 100 * 2.83465; // 100mm → points
|
||||
|
||||
// $plantName = Plant::where('id', $plant)->value('name');
|
||||
|
||||
// $plantAddress = Plant::where('id', $plant)->value('address');
|
||||
|
||||
// $pdf = Pdf::loadView('pdf.wire-pallet', [
|
||||
// 'product' => 'Submersible Winding Wire',
|
||||
// 'plantName' => $plantName,
|
||||
// 'plantAddress' => $plantAddress,
|
||||
// 'monthYear' => now()->format('M-y'),
|
||||
// 'branch' => '',
|
||||
// 'customerCode' => $customerCode,
|
||||
// 'customerName' => $customerName,
|
||||
// 'masterBox' => $boxLabel,
|
||||
// 'items' => $items,
|
||||
// 'grossWeight' => $grossWeight,
|
||||
// 'netWeight' => $grossWeight - 3.05,
|
||||
// 'pallet' => $pallet,
|
||||
// 'qrHtml' => '<barcode code="' . $pallet . '" type="QRCODE,H" class="barcode" />'
|
||||
// ])->setPaper([0, 0, $widthPt, $heightPt], 'portrait');
|
||||
|
||||
// return $pdf->stream("Pallet-{$pallet}.pdf");
|
||||
// // $pdfPath = storage_path("app/public/Pallet-{$pallet}.pdf");
|
||||
// // $pdf->save($pdfPath);
|
||||
|
||||
// // $printerName = 'Tsc';
|
||||
// // $output = [];
|
||||
// // $returnVar = 0;
|
||||
|
||||
// // exec("lp -d {$printerName} " . escapeshellarg($pdfPath), $output, $returnVar);
|
||||
|
||||
// // if ($returnVar == 0) {
|
||||
// // return response()->json([
|
||||
// // 'status' => 'success',
|
||||
// // 'message' => "PDF sent to printer $printerName successfully."
|
||||
// // ]);
|
||||
// // } else {
|
||||
// // return response()->json([
|
||||
// // 'status' => 'error',
|
||||
// // 'message' => "Failed to send PDF to printer $printerName.",
|
||||
// // 'output' => $output,
|
||||
// // 'code' => $returnVar
|
||||
// // ], 500);
|
||||
// // }
|
||||
// }
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*/
|
||||
|
||||
|
||||
public function print(Request $request, $pallet, $plant)
|
||||
{
|
||||
{
|
||||
$customerId = $request->query('customer');
|
||||
|
||||
$customerId = $request->query('customer');
|
||||
|
||||
// $customerName = $request->query('customer_name');
|
||||
|
||||
// $items = WireMasterPacking::with('item')
|
||||
// ->where('plant_id', $plant)
|
||||
// ->where('wire_packing_number', $pallet)
|
||||
// ->get()
|
||||
// ->groupBy('item_id')
|
||||
// ->map(function ($rows) {
|
||||
// $first = $rows->first();
|
||||
|
||||
// return (object) [
|
||||
// 'code' => $first->item->code,
|
||||
// 'description' => $first->item->description,
|
||||
// 'box_count' => $rows->count(),
|
||||
// 'weight' => $rows->sum('weight'),
|
||||
// ];
|
||||
// })
|
||||
// ->values();
|
||||
|
||||
$items = WireMasterPacking::with('item')
|
||||
// Fetch items
|
||||
$items = WireMasterPacking::with('item')
|
||||
->where('plant_id', $plant)
|
||||
->where('wire_packing_number', $pallet)
|
||||
->get()
|
||||
->map(function ($row) {
|
||||
return (object) [
|
||||
'code' => $row->item->code,
|
||||
'code' => $row->item->code,
|
||||
'description' => $row->item->description,
|
||||
'box_count' => 1, // each row = one box
|
||||
'weight' => $row->weight,
|
||||
'box_count' => 1,
|
||||
'weight' => $row->weight,
|
||||
];
|
||||
});
|
||||
|
||||
$masterBox = WireMasterPacking::where('plant_id', $plant)
|
||||
->where('wire_packing_number', $pallet)
|
||||
->value('customer_po_master_id');
|
||||
// Fetch master box & customer info
|
||||
$masterBox = WireMasterPacking::where('plant_id', $plant)
|
||||
->where('wire_packing_number', $pallet)
|
||||
->value('customer_po_master_id');
|
||||
|
||||
$customer = CustomerPoMaster::find($masterBox);
|
||||
$customer = CustomerPoMaster::find($masterBox);
|
||||
$customerCode = $customer->customer_po ?? '';
|
||||
$customerName = $customer->customer_name ?? '';
|
||||
|
||||
$customerCode = $customer->customer_po ?? '';
|
||||
$customerName = $customer->customer_name ?? '';
|
||||
// Calculate total boxes & current pallet number
|
||||
$totalBoxes = WireMasterPacking::where('plant_id', $plant)
|
||||
->where('customer_po_master_id', $customerId)
|
||||
->distinct('wire_packing_number')
|
||||
->count('wire_packing_number');
|
||||
|
||||
// $masterBox = WireMasterPacking::where('plant_id', $plant)
|
||||
// ->where('wire_packing_number', $pallet)
|
||||
// ->distinct('customer_po')
|
||||
// ->count('customer_po');
|
||||
$completedPallets = WireMasterPacking::where('plant_id', $plant)
|
||||
->where('customer_po_master_id', $customerId)
|
||||
->select('wire_packing_number')
|
||||
->groupBy('wire_packing_number')
|
||||
->havingRaw(
|
||||
'COUNT(*) = COUNT(CASE WHEN wire_packing_status = ? THEN 1 END)',
|
||||
['Completed']
|
||||
)
|
||||
->orderBy('wire_packing_number')
|
||||
->pluck('wire_packing_number')
|
||||
->values();
|
||||
|
||||
// $pallets = WireMasterPacking::where('plant_id', $plant)
|
||||
// ->select('wire_packing_number', 'updated_at')
|
||||
// ->distinct('wire_packing_number')
|
||||
// ->orderBy('wire_packing_number')
|
||||
// ->orderBy('updated_at', 'asc')
|
||||
// ->get()
|
||||
// ->pluck('wire_packing_number')
|
||||
// ->values();
|
||||
$index = $completedPallets->search($pallet);
|
||||
$currentPalletNo = ($index !== false) ? $index + 1 : 0;
|
||||
$boxLabel = $currentPalletNo . '/' . $totalBoxes;
|
||||
|
||||
// $currentPalletNo = $pallets->search($pallet) + 1;
|
||||
// Calculate gross weight
|
||||
$grossWeight = $items->sum('weight');
|
||||
|
||||
// $totalBoxes = WireMasterPacking::where('plant_id', $plant)
|
||||
// // ->where('wire_packing_number', $pallet)
|
||||
// ->distinct()
|
||||
// ->count('customer_po');
|
||||
// Page dimensions in points for DomPDF
|
||||
$widthPt = 85 * 2.83465; // 85mm
|
||||
$heightPt = 100 * 2.83465; // 100mm
|
||||
|
||||
// $boxLabel = $currentPalletNo . '/' . $totalBoxes;
|
||||
// Plant info
|
||||
$plantName = Plant::where('id', $plant)->value('name');
|
||||
$plantAddress = Plant::where('id', $plant)->value('address');
|
||||
|
||||
$totalBoxes = WireMasterPacking::where('plant_id', $plant)
|
||||
->where('customer_po_master_id', $customerId)
|
||||
->distinct('wire_packing_number')
|
||||
->count('wire_packing_number');
|
||||
// Generate QR code using GD (no Imagick required)
|
||||
$qrBase64 = 'data:image/png;base64,' . base64_encode(
|
||||
QrCode::format('png')
|
||||
->size(120) // ~12mm
|
||||
->margin(0)
|
||||
->errorCorrection('H')
|
||||
->generate($pallet)
|
||||
);
|
||||
|
||||
$completedPallets = WireMasterPacking::where('plant_id', $plant)
|
||||
->where('customer_po_master_id', $customerId)
|
||||
->select('wire_packing_number')
|
||||
->groupBy('wire_packing_number')
|
||||
->havingRaw(
|
||||
'COUNT(*) = COUNT(CASE WHEN wire_packing_status = ? THEN 1 END)',
|
||||
['Completed']
|
||||
)
|
||||
->orderBy('wire_packing_number')
|
||||
->pluck('wire_packing_number')
|
||||
->values();
|
||||
// Load Blade view with data
|
||||
$pdf = Pdf::loadView('pdf.wire-pallet', [
|
||||
'product' => 'Submersible Winding Wire',
|
||||
'plantName' => $plantName,
|
||||
'plantAddress' => $plantAddress,
|
||||
'monthYear' => now()->format('M-y'),
|
||||
'branch' => '',
|
||||
'customerCode' => $customerCode,
|
||||
'customerName' => $customerName,
|
||||
'masterBox' => $boxLabel,
|
||||
'items' => $items,
|
||||
'grossWeight' => $grossWeight,
|
||||
'netWeight' => $grossWeight - 3.05,
|
||||
'pallet' => $pallet,
|
||||
'qrBase64' => $qrBase64
|
||||
])->setPaper([0, 0, $widthPt, $heightPt], 'portrait');
|
||||
|
||||
return $pdf->stream("Pallet-{$pallet}.pdf");
|
||||
}
|
||||
|
||||
$index = $completedPallets->search($pallet);
|
||||
|
||||
$currentPalletNo = ($index !== false) ? $index + 1 : 0;
|
||||
|
||||
$boxLabel = $currentPalletNo . '/' . $totalBoxes;
|
||||
|
||||
// $completedPallets = WireMasterPacking::where('plant_id', $plant)
|
||||
// ->select('wire_packing_number')
|
||||
// ->groupBy('wire_packing_number')
|
||||
// ->havingRaw('COUNT(*) = COUNT(CASE WHEN wire_packing_status = ? THEN 1 END)', ['Completed'])
|
||||
// ->orderBy('wire_packing_number')
|
||||
// ->pluck('wire_packing_number')
|
||||
// ->values();
|
||||
|
||||
// $currentPalletNo = $completedPallets->search($pallet) != false
|
||||
// ? $completedPallets->search($pallet) + 1
|
||||
// : 0;
|
||||
|
||||
// $boxLabel = $currentPalletNo . '/' . $totalBoxes;
|
||||
|
||||
$grossWeight = $items->sum('weight');
|
||||
$widthPt = 85 * 2.83465; // 85mm → points
|
||||
$heightPt = 100 * 2.83465; // 100mm → points
|
||||
|
||||
$plantName = Plant::where('id', $plant)->value('name');
|
||||
|
||||
$plantAddress = Plant::where('id', $plant)->value('address');
|
||||
|
||||
$pdf = Pdf::loadView('pdf.wire-pallet', [
|
||||
'product' => 'Submersible Winding Wire',
|
||||
'plantName' => $plantName,
|
||||
'plantAddress' => $plantAddress,
|
||||
'monthYear' => now()->format('M-y'),
|
||||
'branch' => '',
|
||||
'customerCode' => $customerCode,
|
||||
'customerName' => $customerName,
|
||||
'masterBox' => $boxLabel,
|
||||
'items' => $items,
|
||||
'grossWeight' => $grossWeight,
|
||||
'netWeight' => $grossWeight - 3.05,
|
||||
'pallet' => $pallet,
|
||||
])->setPaper([0, 0, $widthPt, $heightPt], 'portrait');
|
||||
|
||||
return $pdf->stream("Pallet-{$pallet}.pdf");
|
||||
// $pdfPath = storage_path("app/public/Pallet-{$pallet}.pdf");
|
||||
// $pdf->save($pdfPath);
|
||||
|
||||
// $printerName = 'Tsc';
|
||||
// $output = [];
|
||||
// $returnVar = 0;
|
||||
|
||||
// exec("lp -d {$printerName} " . escapeshellarg($pdfPath), $output, $returnVar);
|
||||
|
||||
// if ($returnVar == 0) {
|
||||
// return response()->json([
|
||||
// 'status' => 'success',
|
||||
// 'message' => "PDF sent to printer $printerName successfully."
|
||||
// ]);
|
||||
// } else {
|
||||
// return response()->json([
|
||||
// 'status' => 'error',
|
||||
// 'message' => "Failed to send PDF to printer $printerName.",
|
||||
// 'output' => $output,
|
||||
// 'code' => $returnVar
|
||||
// ], 500);
|
||||
// }
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
//
|
||||
|
||||
@@ -84,13 +84,13 @@
|
||||
// ->size(120) // 12mm ~ 120px
|
||||
// ->margin(0)
|
||||
// ->generate($pallet)
|
||||
$qrBase64 = 'data:image/png;base64,' . base64_encode(
|
||||
QrCode::format('png')
|
||||
->size(120)
|
||||
->margin(0)
|
||||
->errorCorrection('H')
|
||||
->generate($pallet)
|
||||
);
|
||||
// $qrBase64 = 'data:image/png;base64,' . base64_encode(
|
||||
// QrCode::format('png')
|
||||
// ->size(120)
|
||||
// ->margin(0)
|
||||
// ->errorCorrection('H')
|
||||
// ->generate($pallet)
|
||||
// );
|
||||
@endphp
|
||||
|
||||
<style>
|
||||
@@ -298,7 +298,7 @@
|
||||
max-width: <?php echo $isilogoMaxWidth; ?>mm;
|
||||
left: 71mm;"> --}}
|
||||
<img src="{{ $qrBase64 }}"
|
||||
style="position: absolute; bottom: 1.2mm; right: 2mm; width: 8mm; height: 7.2mm;">
|
||||
style="position: absolute; bottom: 1.2mm; right: 2mm; width: 8mm; height: 7.2mm;">
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user