rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Revert "Merge branch '512-cmb-warranty-expiration-computation' into '488-cmb-live'"

Browse source 
This reverts merge request !594
This commit is contained in:
Kendrick Chan 2020-10-01 15:09:43 +00:00
parent 6106b01964
commit e53bb8f69b
5 changed files with 6 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/services.yaml
View file

@ -197,12 +197,6 @@ services:
App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\CMBRiderAPIHandler" App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\CMBRiderAPIHandler"
# warranty handler service
App\Service\WarrantyHandler\CMBWarrantyHandler: ~
# warranty handler interface
App\Service\WarrantyHandlerInterface: "@App\\Service\\WarrantyHandler\\CMBWarrantyHandler"
# map manager # map manager
#App\Service\GISManager\Bing: ~ #App\Service\GISManager\Bing: ~
App\Service\GISManager\OpenStreet: ~ App\Service\GISManager\OpenStreet: ~

6
src/Ramcar/CMBWarrantyClass.php
View file

@ -4,14 +4,12 @@ namespace App\Ramcar;
class CMBWarrantyClass extends NameValue class CMBWarrantyClass extends NameValue
{ {
const WTY_PASSENGER = 'passenger'; const WTY_PASSENGER = 'passenger';
const WTY_COMMERCIAL = 'commercial'; const WTY_COMMERCIAL = 'commercial';
const WTY_GRAB = 'grab';
const COLLECTION = [ const COLLECTION = [
'passenger' => 'Passenger', 'passenger' => 'Passenger',
'commercial' => 'Commercial', 'commercial' => 'Commercial',
'grab' => 'Grab',
]; ];
} }

4
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -44,7 +44,7 @@ use App\Service\InvoiceGeneratorInterface;
use App\Service\JobOrderHandlerInterface; use App\Service\JobOrderHandlerInterface;
use App\Service\RiderAssignmentHandlerInterface; use App\Service\RiderAssignmentHandlerInterface;
use App\Service\CustomerHandlerInterface; use App\Service\CustomerHandlerInterface;
use App\Service\WarrantyHandlerInterface; use App\Service\WarrantyHandler;
use App\Service\MQTTClient; use App\Service\MQTTClient;
use App\Service\APNSClient; use App\Service\APNSClient;
use App\Service\MapTools; use App\Service\MapTools;
@ -75,7 +75,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
public function __construct(Security $security, EntityManagerInterface $em, public function __construct(Security $security, EntityManagerInterface $em,
InvoiceGeneratorInterface $ic, ValidatorInterface $validator, InvoiceGeneratorInterface $ic, ValidatorInterface $validator,
TranslatorInterface $translator, RiderAssignmentHandlerInterface $rah, TranslatorInterface $translator, RiderAssignmentHandlerInterface $rah,
string $country_code, WarrantyHandlerInterface $wh, string $country_code, WarrantyHandler $wh,
CustomerHandlerInterface $cust_handler) CustomerHandlerInterface $cust_handler)
{ {
$this->em = $em; $this->em = $em;

4
src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
View file

@ -20,7 +20,7 @@ use App\Service\RiderAPIHandlerInterface;
use App\Service\RedisClientProvider; use App\Service\RedisClientProvider;
use App\Service\RiderCache; use App\Service\RiderCache;
use App\Service\MQTTClient; use App\Service\MQTTClient;
use App\Service\WarrantyHandlerInterface; use App\Service\WarrantyHandler;
use App\Service\JobOrderHandlerInterface; use App\Service\JobOrderHandlerInterface;
use App\Service\InvoiceGeneratorInterface; use App\Service\InvoiceGeneratorInterface;
use App\Service\RiderTracker; use App\Service\RiderTracker;
@ -61,7 +61,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
public function __construct(EntityManagerInterface $em, RedisClientProvider $redis, public function __construct(EntityManagerInterface $em, RedisClientProvider $redis,
EncoderFactoryInterface $ef, RiderCache $rcache, EncoderFactoryInterface $ef, RiderCache $rcache,
string $country_code, MQTTClient $mclient, string $country_code, MQTTClient $mclient,
WarrantyHandlerInterface $wh, JobOrderHandlerInterface $jo_handler, WarrantyHandler $wh, JobOrderHandlerInterface $jo_handler,
InvoiceGeneratorInterface $ic, string $upload_dir, InvoiceGeneratorInterface $ic, string $upload_dir,
RiderTracker $rider_tracker, NotificationManager $nm, RiderTracker $rider_tracker, NotificationManager $nm,
UrlGeneratorInterface $router) UrlGeneratorInterface $router)

27
src/Service/WarrantyHandlerInterface.php
View file

@ -1,27 +0,0 @@
<?php
namespace App\Service;
use App\Entity\Warranty;
use DateTime;
interface WarrantyHandlerInterface
{
public function createWarranty(string $serial, string $plate_number, string $first_name, string$last_name,
string $mobile_number, array $batt_list, DateTime $date_purchase,
string $warranty_class);
public function updateCustomerVehicle(string $serial, array $batteries, string $plate_number, DateTime $date_expire);
public function updateWarranty(Warranty $warr, string $first_name, string $last_name, string $mobile_number,
array $batt_list, DateTime $date_purchase);
public function computeDateExpire(DateTime $date_create, int $warranty_period);
public function getWarrantyPeriod(array $batteries, string $warranty_class);
public function getBatteriesForWarranty(Warranty $warr);
public function cleanPlateNumber(string $plate);
}