From cc132288f8edf7d92b6cb34f1ab4715f196b8810 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 11:31:11 +0800 Subject: [PATCH 01/12] Add trade-in categories #66 --- src/Ramcar/TradeInType.php | 8 +++++--- src/Service/InvoiceCreator.php | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Ramcar/TradeInType.php b/src/Ramcar/TradeInType.php index eeb559fa..fa830be0 100644 --- a/src/Ramcar/TradeInType.php +++ b/src/Ramcar/TradeInType.php @@ -4,11 +4,13 @@ namespace App\Ramcar; class TradeInType extends NameValue { - const MOTOLITE = 'motolite'; - const OTHER = 'other'; + const PREMIUM = 'premium'; + const MOTOLITE = 'motolite'; + const OTHER = 'other'; const COLLECTION = [ - 'motolite' => 'Motolite', + 'premium' => 'Premium', + 'motolite' => 'Non-premium', 'other' => 'Other', ]; } diff --git a/src/Service/InvoiceCreator.php b/src/Service/InvoiceCreator.php index 89504d31..aea1d63f 100644 --- a/src/Service/InvoiceCreator.php +++ b/src/Service/InvoiceCreator.php @@ -37,6 +37,7 @@ class InvoiceCreator public function getTradeInRate($trade_in) { + // TODO: modify this with the prices based on size if ($trade_in == 'motolite') return self::TIRATE_MOTOLITE; From b007352b19e361e28639d929b2710f4fa6073247 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 11:45:25 +0800 Subject: [PATCH 02/12] Relabel JO service types #66 --- src/Ramcar/ServiceType.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ramcar/ServiceType.php b/src/Ramcar/ServiceType.php index 28c68d98..abdc19e4 100644 --- a/src/Ramcar/ServiceType.php +++ b/src/Ramcar/ServiceType.php @@ -14,13 +14,13 @@ class ServiceType extends NameValue const EMERGENCY_REFUEL = 'fuel'; const COLLECTION = [ - 'battery_new' => 'Battery Replacement (New)', - 'battery_warranty' => 'Battery Replacement (Under Warranty)', + 'battery_new' => 'Battery Sales', + 'battery_warranty' => 'Under Warranty', 'jumpstart_troubleshoot' => 'General Service', 'post_recharged' => 'Post - Recharged', 'post_replacement' => 'Post - Replacement', - 'tire' => 'Tire Repair', + 'tire' => 'Flat Tire', 'overheat' => 'Overheat Assistance', - 'fuel' => 'Emergency Refuel', + 'fuel' => 'Fuel', ]; } From 66294ba62cb48174c98c233dcbf7dcaeca8095dc Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 11:46:34 +0800 Subject: [PATCH 03/12] Remove customer title requirement, now optional #66 --- src/Entity/Customer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php index 9dc7e98c..641b188c 100644 --- a/src/Entity/Customer.php +++ b/src/Entity/Customer.php @@ -25,7 +25,6 @@ class Customer // title /** * @ORM\Column(type="string", length=80) - * @Assert\NotBlank() */ protected $title; From b5f4f0158722bc111f724048d06ef3802a5c49d3 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 11:48:32 +0800 Subject: [PATCH 04/12] Rename call to hotline in transaction origin #66 --- src/Ramcar/TransactionOrigin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ramcar/TransactionOrigin.php b/src/Ramcar/TransactionOrigin.php index a7f64b73..3ec4fe5d 100644 --- a/src/Ramcar/TransactionOrigin.php +++ b/src/Ramcar/TransactionOrigin.php @@ -10,7 +10,7 @@ class TransactionOrigin extends NameValue const MOBILE_APP = 'mobile_app'; const COLLECTION = [ - 'call' => 'Call', + 'call' => 'Hotline', 'online' => 'Online', 'facebook' => 'Facebook', 'mobile_app' => 'Mobile App', From 04e2f88c9429f5f6de94eafcc1d825651221ba89 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 11:51:58 +0800 Subject: [PATCH 05/12] Add VIP to transaction origin #66 --- src/Ramcar/TransactionOrigin.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Ramcar/TransactionOrigin.php b/src/Ramcar/TransactionOrigin.php index 3ec4fe5d..baf412f1 100644 --- a/src/Ramcar/TransactionOrigin.php +++ b/src/Ramcar/TransactionOrigin.php @@ -7,12 +7,14 @@ class TransactionOrigin extends NameValue const CALL = 'call'; const ONLINE = 'online'; const FACEBOOK = 'facebook'; + const VIP = 'vip'; const MOBILE_APP = 'mobile_app'; const COLLECTION = [ 'call' => 'Hotline', 'online' => 'Online', 'facebook' => 'Facebook', + 'vip' => 'VIP', 'mobile_app' => 'Mobile App', ]; } From 451eb46bb91bf4657ca47bc81aa0ab1dd53c58de Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 11:58:22 +0800 Subject: [PATCH 06/12] Increase size of tier 1 and tier 2 notes in jo form #66 --- templates/job-order/form.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index 238f887a..45675122 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -282,12 +282,12 @@
- +
- +
From b234fb534408b872b2fe8c13bd0d2c1a81c45d34 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 12:00:27 +0800 Subject: [PATCH 07/12] Adjust JO status entries #66 --- src/Ramcar/JOStatus.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Ramcar/JOStatus.php b/src/Ramcar/JOStatus.php index 3a08679f..d31447db 100644 --- a/src/Ramcar/JOStatus.php +++ b/src/Ramcar/JOStatus.php @@ -7,16 +7,18 @@ class JOStatus extends NameValue const PENDING = 'pending'; const RIDER_ASSIGN = 'rider_assign'; const ASSIGNED = 'assigned'; + const IN_TRANSIT = 'in_transit'; const IN_PROGRESS = 'in_progress'; const CANCELLED = 'cancelled'; const FULFILLED = 'fulfilled'; const COLLECTION = [ - 'pending' => 'Pending', + 'pending' => 'For Dispatch', 'rider_assign' => 'For Rider Assignment', 'assigned' => 'Assigned', + 'in_transit' => 'In Transit', 'in_progress' => 'In Progress', 'cancelled' => 'Cancelled', - 'fulfilled' => 'Fulfilled', + 'fulfilled' => 'Completed', ]; } From ce4abc42ef9e03e3f2f1cf1fd1584eac5924e7ef Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 12:09:38 +0800 Subject: [PATCH 08/12] Remove assignor column from all job order lists #66 --- templates/job-order/list.all.html.twig | 4 ---- templates/job-order/list.assigning.html.twig | 4 ---- templates/job-order/list.fulfillment.html.twig | 4 ---- templates/job-order/list.open.html.twig | 4 ---- 4 files changed, 16 deletions(-) diff --git a/templates/job-order/list.all.html.twig b/templates/job-order/list.all.html.twig index a9887bcc..0c446c6c 100644 --- a/templates/job-order/list.all.html.twig +++ b/templates/job-order/list.all.html.twig @@ -97,10 +97,6 @@ field: 'processor', title: 'Dispatcher' }, - { - field: 'assignor', - title: 'Assignor' - }, { field: 'Actions', width: 110, diff --git a/templates/job-order/list.assigning.html.twig b/templates/job-order/list.assigning.html.twig index 18fa348e..2b68ba7e 100644 --- a/templates/job-order/list.assigning.html.twig +++ b/templates/job-order/list.assigning.html.twig @@ -97,10 +97,6 @@ field: 'processor', title: 'Dispatcher' }, - { - field: 'assignor', - title: 'Assignor' - }, { field: 'Actions', width: 110, diff --git a/templates/job-order/list.fulfillment.html.twig b/templates/job-order/list.fulfillment.html.twig index 3fc20a2b..b425e792 100644 --- a/templates/job-order/list.fulfillment.html.twig +++ b/templates/job-order/list.fulfillment.html.twig @@ -97,10 +97,6 @@ field: 'processor', title: 'Dispatcher' }, - { - field: 'assignor', - title: 'Assignor' - }, { field: 'Actions', width: 110, diff --git a/templates/job-order/list.open.html.twig b/templates/job-order/list.open.html.twig index 7e1ed22c..0f7ddb97 100644 --- a/templates/job-order/list.open.html.twig +++ b/templates/job-order/list.open.html.twig @@ -97,10 +97,6 @@ field: 'processor', title: 'Dispatcher' }, - { - field: 'assignor', - title: 'Assignor' - }, { field: 'Actions', width: 110, From 5eb73c7292a08e83d0a1260881e55e9499d44ba0 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 12:12:16 +0800 Subject: [PATCH 09/12] Comment out travel time and distance columns in job order dispatch form #66 --- templates/job-order/form.html.twig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index 45675122..560ffea9 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -528,8 +528,10 @@ Hub Branch + Available Riders Jobs For Assignment Contact Numbers @@ -545,8 +547,10 @@ {{ hub.hub.getName }} {{ hub.hub.getBranch }} + {{ hub.rider_count }} {{ hub.jo_count }} {{ hub.hub.getContactNumbers }} From 15e2650fc21a4ea79f5a340f8f10ce64fa253a6f Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 13:42:25 +0800 Subject: [PATCH 10/12] Add comma delimiter to contact number lines in nearest hub list #66 --- templates/job-order/form.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index 560ffea9..91c6c39a 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -553,7 +553,7 @@ --> {{ hub.rider_count }} {{ hub.jo_count }} - {{ hub.hub.getContactNumbers }} + {{ hub.hub.getContactNumbers|replace({"\n": ', '}) }} {% endfor %} From 27073a8c797b11a1ec8b72362c8f1206b381fd2a Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 13:44:45 +0800 Subject: [PATCH 11/12] Relabel warranty code to serial number in all forms #66 --- templates/customer/form.html.twig | 2 +- templates/job-order/form.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig index 5278a332..f1fa1853 100644 --- a/templates/customer/form.html.twig +++ b/templates/customer/form.html.twig @@ -371,7 +371,7 @@
- +
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index 91c6c39a..afbfac8f 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -195,7 +195,7 @@
- +
From 496b032e7019a08d00ec2fa4367b96fa7bc442a2 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Tue, 3 Apr 2018 13:45:23 +0800 Subject: [PATCH 12/12] Relabel installment to installment - BDO #66 --- src/Ramcar/ModeOfPayment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ramcar/ModeOfPayment.php b/src/Ramcar/ModeOfPayment.php index 77f0098f..7e067630 100644 --- a/src/Ramcar/ModeOfPayment.php +++ b/src/Ramcar/ModeOfPayment.php @@ -13,6 +13,6 @@ class ModeOfPayment extends NameValue 'cash' => 'Cash', 'credit_card' => 'Credit Card', 'debit_card' => 'Debit Card', - 'installment' => 'Installment', + 'installment' => 'Installment - BDO', ]; }