Merge branch '752-resq-2-fix-return-values-for-invoice-data' into '746-resq-2-0-final'

Resolve "RESQ 2: Fix return values for invoice data"

See merge request jankstudio/resq!867

src/Controller/TAPI/BatteryController.php

@@ -9,7 +9,7 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\EntityManagerInterface;
 
 use Catalyst\ApiBundle\Controller\ApiController;
-use Catalyst\ApiBundle\Response\APIResponse;
+use Catalyst\ApiBundle\Component\Response as APIResponse;
 use App\Ramcar\APIResult;
 
 use App\Entity\Vehicle;

src/Controller/TAPI/JobOrderController.php

@@ -12,7 +12,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use CrEOF\Spatial\PHP\Types\Geometry\Point;
 
 use Catalyst\ApiBundle\Controller\ApiController;
-use Catalyst\ApiBundle\Response\APIResponse;
+use Catalyst\ApiBundle\Component\Response as APIResponse;
 
 use App\Ramcar\WarrantyClass;
 use App\Ramcar\JOStatus;

src/Controller/TAPI/PromoController.php

@@ -9,7 +9,7 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\EntityManagerInterface;
 
 use Catalyst\ApiBundle\Controller\ApiController;
-use Catalyst\ApiBundle\Response\APIResponse;
+use Catalyst\ApiBundle\Component\Response as APIResponse;
 
 use App\Entity\Promo;
 

src/Controller/TAPI/ServiceController.php

@@ -9,7 +9,7 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\EntityManagerInterface;
 
 use Catalyst\ApiBundle\Controller\ApiController;
-use Catalyst\ApiBundle\Response\APIResponse;
+use Catalyst\ApiBundle\Component\Response as APIResponse;
 
 use App\Entity\Service;
 

src/Controller/TAPI/VehicleController.php

@@ -9,7 +9,7 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\EntityManagerInterface;
 
 use Catalyst\ApiBundle\Controller\ApiController;
-use Catalyst\ApiBundle\Response\APIResponse;
+use Catalyst\ApiBundle\Component\Response as APIResponse;
 
 use App\Entity\VehicleManufacturer;
 use App\Entity\Vehicle;

src/Service/InvoiceManager.php

@@ -263,7 +263,7 @@ class InvoiceManager implements InvoiceGeneratorInterface
                 $invoice_item->setInvoice($invoice)
                     ->setTitle($item['title'])
                     ->setQuantity($item['quantity'])
-                    ->setPrice($item['price']);
+                    ->setPrice((float)$item['price']);
 
                 if ($item['battery'] != null)
                     $invoice_item->setBattery($item['battery']);
@@ -271,11 +271,13 @@ class InvoiceManager implements InvoiceGeneratorInterface
                 $invoice->addItem($invoice_item);
             }
 
-            $invoice->setTotalPrice($total['total_price'])
+            // RULE: TYPECAST these values since bc operations return a string
-                ->setVATExclusivePrice($total['vat_ex_price'])
+            // and these fields are going to be placed in a JSON response
-                ->setVAT($total['vat'])
+            $invoice->setTotalPrice((float)$total['total_price'])
-                ->setDiscount($total['discount'])
+                ->setVATExclusivePrice((float)$total['vat_ex_price'])
-                ->setTradeIn($total['ti_rate'])
+                ->setVAT((float)$total['vat'])
+                ->setDiscount((float)$total['discount'])
+                ->setTradeIn((float)$total['ti_rate'])
                 ->setStatus(InvoiceStatus::DRAFT);
         }