From 36e4219f99f62cdd7b495407e133f5d7fc89267b Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Mar 2018 07:28:59 +0800 Subject: [PATCH] Add support for mode of payment dropdown #33 --- src/Controller/JobOrderController.php | 9 +++++++++ src/Entity/JobOrder.php | 18 ++++++++++++++++++ src/Ramcar/ModeOfPayment.php | 18 ++++++++++++++++++ templates/job-order/form.html.twig | 12 +++++++++++- 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 src/Ramcar/ModeOfPayment.php diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index f78d8eaf..2fc97e83 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -10,6 +10,8 @@ use App\Ramcar\DiscountApply; use App\Ramcar\TradeInType; use App\Ramcar\InvoiceCriteria; use App\Ramcar\InvoiceStatus; +use App\Ramcar\ModeOfPayment; + use App\Entity\JobOrder; use App\Entity\BatteryManufacturer; use App\Entity\Customer; @@ -134,6 +136,7 @@ class JobOrderController extends BaseController $params['promos'] = $em->getRepository(Promo::class)->findAll(); $params['service_types'] = ServiceType::getCollection(); $params['warranty_classes'] = WarrantyClass::getCollection(); + $params['modes_of_payment'] = ModeOfPayment::getCollection(); $params['statuses'] = JOStatus::getCollection(); $params['discount_apply'] = DiscountApply::getCollection(); $params['trade_in_types'] = TradeInType::getCollection(); @@ -569,6 +572,7 @@ class JobOrderController extends BaseController $params['customers'] = $em->getRepository(Customer::class)->findAll(); $params['service_types'] = ServiceType::getCollection(); $params['warranty_classes'] = WarrantyClass::getCollection(); + $params['modes_of_payment'] = ModeOfPayment::getCollection(); $params['statuses'] = JOStatus::getCollection(); $params['promos'] = $em->getRepository(Promo::class)->findAll(); $params['discount_apply'] = DiscountApply::getCollection(); @@ -765,6 +769,7 @@ class JobOrderController extends BaseController $params['customers'] = $em->getRepository(Customer::class)->findAll(); $params['service_types'] = ServiceType::getCollection(); $params['warranty_classes'] = WarrantyClass::getCollection(); + $params['modes_of_payment'] = ModeOfPayment::getCollection(); $params['statuses'] = JOStatus::getCollection(); $params['promos'] = $em->getRepository(Promo::class)->findAll(); $params['discount_apply'] = DiscountApply::getCollection(); @@ -893,6 +898,7 @@ class JobOrderController extends BaseController $params['customers'] = $em->getRepository(Customer::class)->findAll(); $params['service_types'] = ServiceType::getCollection(); $params['warranty_classes'] = WarrantyClass::getCollection(); + $params['modes_of_payment'] = ModeOfPayment::getCollection(); $params['statuses'] = JOStatus::getCollection(); $params['promos'] = $em->getRepository(Promo::class)->findAll(); $params['discount_apply'] = DiscountApply::getCollection(); @@ -993,6 +999,7 @@ class JobOrderController extends BaseController $params['customers'] = $em->getRepository(Customer::class)->findAll(); $params['service_types'] = ServiceType::getCollection(); $params['warranty_classes'] = WarrantyClass::getCollection(); + $params['modes_of_payment'] = ModeOfPayment::getCollection(); $params['statuses'] = JOStatus::getCollection(); $params['promos'] = $em->getRepository(Promo::class)->findAll(); $params['discount_apply'] = DiscountApply::getCollection(); @@ -1147,6 +1154,7 @@ class JobOrderController extends BaseController $params['customers'] = $em->getRepository(Customer::class)->findAll(); $params['service_types'] = ServiceType::getCollection(); $params['warranty_classes'] = WarrantyClass::getCollection(); + $params['modes_of_payment'] = ModeOfPayment::getCollection(); $params['statuses'] = JOStatus::getCollection(); $params['promos'] = $em->getRepository(Promo::class)->findAll(); $params['discount_apply'] = DiscountApply::getCollection(); @@ -1260,6 +1268,7 @@ class JobOrderController extends BaseController $params['customers'] = $em->getRepository(Customer::class)->findAll(); $params['service_types'] = ServiceType::getCollection(); $params['warranty_classes'] = WarrantyClass::getCollection(); + $params['modes_of_payment'] = ModeOfPayment::getCollection(); $params['statuses'] = JOStatus::getCollection(); $params['promos'] = $em->getRepository(Promo::class)->findAll(); $params['discount_apply'] = DiscountApply::getCollection(); diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php index d2da205f..2faf6c2e 100644 --- a/src/Entity/JobOrder.php +++ b/src/Entity/JobOrder.php @@ -8,6 +8,7 @@ use Symfony\Component\Validator\Constraints as Assert; use CrEOF\Spatial\PHP\Types\Geometry\Point; use DateTime; +use App\Ramcar\ModeOfPayment; /** * @ORM\Entity @@ -192,6 +193,11 @@ class JobOrder */ protected $ref_jo; + /** + * @ORM\Column(type="string", length=50) + */ + protected $mode_of_payment; + public function __construct() { $this->date_create = new DateTime(); @@ -199,6 +205,7 @@ class JobOrder $this->flag_advance = false; $this->source = 'mobile'; + $this->mode_of_payment = ModeOfPayment::CASH; } public function getID() @@ -497,4 +504,15 @@ class JobOrder { return $this->ref_jo; } + + public function setModeOfPayment($mode) + { + $this->mode_of_payment = $mode; + return $this; + } + + public function getModeOfPayment() + { + return $this->mode_of_payment; + } } diff --git a/src/Ramcar/ModeOfPayment.php b/src/Ramcar/ModeOfPayment.php new file mode 100644 index 00000000..77f0098f --- /dev/null +++ b/src/Ramcar/ModeOfPayment.php @@ -0,0 +1,18 @@ + 'Cash', + 'credit_card' => 'Credit Card', + 'debit_card' => 'Debit Card', + 'installment' => 'Installment', + ]; +} diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index f0d9c0e5..37bc4120 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -202,7 +202,7 @@
-
+
+
+ + + +