From 474298a42b15a2c117acb6d7afd838dac9e9d881 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 11 Oct 2022 05:23:23 +0000 Subject: [PATCH 1/3] Add a break when service type is set to jumpstart_warranty. #713 --- src/Service/InvoiceGenerator/ResqInvoiceGenerator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php index f1baf1c3..26b79da2 100644 --- a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php +++ b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php @@ -84,7 +84,7 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface break; case ServiceType::JUMPSTART_WARRANTY: $this->processJumpstartWarranty($total, $invoice); - + break; case ServiceType::BATTERY_REPLACEMENT_NEW: $this->processEntries($total, $criteria, $invoice); /* @@ -726,7 +726,7 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface $stype = $criteria->getServiceType(); $cv = $criteria->getCustomerVehicle(); $has_coolant = $criteria->hasCoolant(); - // error_log($stype); + error_log('mogol ' . $stype); $cust_tag_info = []; switch ($stype) { From 36cf10871ed8e958ac1349c6eb8716a4d179708b Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 11 Oct 2022 05:37:24 +0000 Subject: [PATCH 2/3] Comment debug logs. #713 --- src/Service/InvoiceGenerator/ResqInvoiceGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php index 26b79da2..0a5615f1 100644 --- a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php +++ b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php @@ -726,7 +726,7 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface $stype = $criteria->getServiceType(); $cv = $criteria->getCustomerVehicle(); $has_coolant = $criteria->hasCoolant(); - error_log('mogol ' . $stype); + // error_log($stype); $cust_tag_info = []; switch ($stype) { From 9112bf55f17dc3756bb749039552256385c785f5 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 11 Oct 2022 07:06:58 +0000 Subject: [PATCH 3/3] Fix formatting for floats. #713 --- src/Controller/TAPI/JobOrderController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Controller/TAPI/JobOrderController.php b/src/Controller/TAPI/JobOrderController.php index d22a8725..e70928f8 100644 --- a/src/Controller/TAPI/JobOrderController.php +++ b/src/Controller/TAPI/JobOrderController.php @@ -377,11 +377,11 @@ class JobOrderController extends APIController // make invoice json data $invoice_data = [ - 'total_price' => $invoice->getTotalPrice(), - 'vat_ex_price' => (float) $invoice->getVATExclusivePrice(), - 'vat' => $invoice->getVAT(), - 'discount' => $invoice->getDiscount(), - 'trade_in' => $invoice->getTradeIn(), + 'total_price' => number_format($invoice->getTotalPrice(), 2, '.', ''), + 'vat_ex_price' => number_format($invoice->getVATExclusivePrice(), 2, '.', ''), + 'vat' => number_format($invoice->getVAT(), 2, '.', ''), + 'discount' => number_format($invoice->getDiscount(), 2, '.', ''), + 'trade_in' => number_format($invoice->getTradeIn(), 2, '.', ''), ]; $items = $invoice->getItems(); $items_data = []; @@ -390,7 +390,7 @@ class JobOrderController extends APIController $items_data[] = [ 'title' => $item->getTitle(), 'qty' => $item->getQuantity() + 0, - 'price' => $item->getPrice() + 0.0, + 'price' => number_format($item->getPrice() + 0.0, 2, '.', '') ]; } $invoice_data['items'] = $items_data;