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

Merge branch '579-add-warranty-source-to-warranty-entity' into 'master-fix'

Browse source 
Resolve "Add warranty source to Warranty entity"

See merge request jankstudio/resq!692
This commit is contained in:
Kendrick Chan 2021-06-10 07:58:07 +00:00
commit 6c64055e69
8 changed files with 81 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Command/GenerateWarrantyFromJobOrderCommand.php
View file

@ -210,9 +210,10 @@ class GenerateWarrantyFromJobOrderCommand extends Command
$values = '(' . $bty_model_id . ',' . $bty_size_id . ',NULL,\'' . $warranty_class . '\',\''
. $cleaned_plate_number . '\',\'' . WarrantyStatus::ACTIVE . '\',\'' . $date_create . '\',\'' . $date_purchase
. '\',\'' . $date_expire . '\',NULL,'
. $sap_code . ',NULL,\'' . $first_name . '\',\'' . $last_name . '\',\'' . $mobile_number . '\',' . 0 . ',NULL' . ');';
. $sap_code . ',NULL,\'' . $first_name . '\',\'' . $last_name . '\',\'' . $mobile_number . '\',' . 0 . ',NULL,\''
. WarrantySource::COMMAND .'\');';
$sql_statement = 'INSERT INTO `warranty` (bty_model_id,bty_size_id,serial,warranty_class,plate_number,status,date_create,date_purchase,date_expire,date_claim,sap_bty_id,claim_id,first_name,last_name,mobile_number,flag_activated,warranty_privacy_policy) VALUES ' . $values . "\n";
$sql_statement = 'INSERT INTO `warranty` (bty_model_id,bty_size_id,serial,warranty_class,plate_number,status,date_create,date_purchase,date_expire,date_claim,sap_bty_id,claim_id,first_name,last_name,mobile_number,flag_activated,warranty_privacy_policy,create_source) VALUES ' . $values . "\n";
echo $sql_statement;

3
src/Controller/APIController.php
View file

@ -3151,6 +3151,9 @@ class APIController extends Controller implements LoggedController
{
$warr = new Warranty();
$sms_msg = $trans->trans('warranty_register_confirm');
// set warranty source
$warr->setCreateSource($source);
}
// get sap battery

22
src/Controller/CAPI/CustomerWarrantyController.php
View file

@ -2,6 +2,8 @@
namespace App\Controller\CAPI;
use Catalyst\APIBundle\Entity\User as APIUser;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\KernelInterface;
@ -315,7 +317,11 @@ class CustomerWarrantyController extends APIController
'invoice' => $req->request->get('invoice'),
];
$action = 'create/update';
$source = WarrantySource::CAPI;
// get the api_user that made the call so that it gets added to the source
// source becomes CAPI_USER_<insert name of api user here>
$username = $this->getAPIUsername($em, $user_id);
$source = 'CAPI_USER_' . $username;
error_log('SOURCE: ' . $source);
@ -425,6 +431,9 @@ class CustomerWarrantyController extends APIController
{
$warr = new Warranty();
$sms_message = $trans->trans('warranty_register_confirm');
// set warranty's create source
$warr->setCreateSource($source);
}
error_log('sap battery check');
@ -579,4 +588,15 @@ class CustomerWarrantyController extends APIController
$rt->sendSMS($clean_num, 'MOTOLITE', $message);
}
protected function getAPIUsername($em, $user_id)
{
$api_user_result = $em->getRepository(APIUser::class)->findBy(['api_key' => $user_id]);
$username = '';
foreach ($api_user_result as $api_user)
{
$username = $api_user->getName();
}
return $username;
}
}

34
src/Controller/CAPI/WarrantyController.php
View file

@ -2,6 +2,8 @@
namespace App\Controller\CAPI;
use Catalyst\APIBundle\Entity\User as APIUser;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Doctrine\ORM\Query;
@ -191,7 +193,12 @@ class WarrantyController extends APIController
'mobile_number' => $mnum,
];
$action = 'create';
$source = WarrantySource::CAPI;
// get the api_user that made the call so that it gets added to the source
// source becomes CAPI_USER_<insert name of api user here>
$username = $this->getAPIUsername($em, $user_id);
$source = 'CAPI_USER_' . $username;
$msg = $this->checkRequiredParameters($req, $params);
error_log('msg - ' . $msg);
@ -275,7 +282,8 @@ class WarrantyController extends APIController
->setSAPBattery($batt)
->setDatePurchase($date_pur)
->setDateClaim(null)
->setDateExpire($date_expire);
->setDateExpire($date_expire)
->setCreateSource($source);
try
{
@ -321,7 +329,12 @@ class WarrantyController extends APIController
'id' => $id,
];
$action = 'claim';
$source = WarrantySource::CAPI;
// get the api_user that made the call so that it gets added to the source
// source becomes CAPI_USER_<insert name of api user here>
$username = $this->getAPIUsername($em, $user_id);
$source = 'CAPI_USER_' . $username;
$msg = $this->checkRequiredParameters($req, $params);
if ($msg)
@ -370,7 +383,8 @@ class WarrantyController extends APIController
->setDatePurchase($warr->getDatePurchase())
->setDateClaim(null)
->setDateExpire($warr->getDateExpire())
->setClaimedFrom($warr);
->setClaimedFrom($warr)
->setCreateSource($source);
$em->persist($new_warr);
@ -775,4 +789,16 @@ class WarrantyController extends APIController
return $customers;
}
protected function getAPIUsername($em, $user_id)
{
$api_user_result = $em->getRepository(APIUser::class)->findBy(['api_key' => $user_id]);
$username = '';
foreach ($api_user_result as $api_user)
{
$username = $api_user->getName();
}
return $username;
}
}

3
src/Controller/WarrantyController.php
View file

@ -176,7 +176,8 @@ class WarrantyController extends Controller
->setMobileNumber($req->request->get('mobile_number'))
->setDatePurchase($date_purchase)
->setClaimedFrom($req->request->get('claim_from'))
->setStatus($req->request->get('status'));
->setStatus($req->request->get('status'))
->setCreateSource(WarrantySource::ADMIN_PANEL);
if ($date_claim)
{

18
src/Entity/Warranty.php
View file

@ -232,6 +232,11 @@ class Warranty
*/
protected $municipality_id;
/**
* @ORM\Column(type="string", length=80, options={"default": "legacy"})
*/
protected $create_source;
public function __construct()
{
$this->date_create = new DateTime();
@ -242,6 +247,7 @@ class Warranty
$this->email = '';
$this->odometer = 0;
$this->flag_validated = false;
$this->create_source = 'unknown';
}
public function getID()
@ -658,4 +664,16 @@ class Warranty
{
return $this->municipality_id;
}
public function setCreateSource($source)
{
$this->create_source = $source;
return $this;
}
public function getCreateSource()
{
return $this->create_source;
}
}

2
src/Ramcar/WarrantySource.php
View file

@ -10,6 +10,7 @@ class WarrantySource extends NameValue
const BULK_UPLOAD = 'bulk_upload';
const MOBILE = 'mobile';
const COMMAND = 'command';
const UNKNOWN = 'unknown';
const COLLECTION = [
'capi' => 'Third Party API',
@ -18,6 +19,7 @@ class WarrantySource extends NameValue
'bulk_upload' => 'Bulk Upload',
'mobile' => 'Mobile API',
'command' => 'Command',
'unknown' => 'Unknown',
];
}

3
src/Service/WarrantyHandler.php
View file

@ -93,7 +93,8 @@ class WarrantyHandler
->setLastName($last_name)
->setMobileNumber($mobile_number)
->setDatePurchase($date_purchase)
->setWarrantyClass($warranty_class);
->setWarrantyClass($warranty_class)
->setCreateSource($source);
$this->em->persist($warranty);
$this->em->flush();