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

Add source to invoice criteria. Modify invoice rules to get service fees from... #1701

Merged
arcticzero merged 217 commits from 746-resq-2-0-final into master 2023-11-22 08:54:48 +00:00
Conversation 2 Commits 217 Files changed 179 +5 -4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 403de63251 - Show all commits

4
src/Controller/CustomerAppAPI/JobOrderController.php
View file

@ -892,7 +892,7 @@ class JobOrderController extends ApiController
$customer->removeCustomerTag($customer_tag);
// log the availment of promo from customer
$created_by = $req->query->get('api_key');;
$created_by = $req->query->get('session_key');
$cust_id = $jo->getCustomer()->getID();
$cust_fname = $jo->getCustomer()->getFirstName();
$cust_lname = $jo->getCustomer()->getLastName();
@ -1219,7 +1219,7 @@ class JobOrderController extends ApiController
$customer->removeCustomerTag($customer_tag);
// log the availment of promo from customer
$created_by = $req->query->get('api_key');;
$created_by = $req->query->get('session_key');
$cust_id = $jo->getCustomer()->getID();
$cust_fname = $jo->getCustomer()->getFirstName();
$cust_lname = $jo->getCustomer()->getLastName();

5
src/Controller/CustomerAppAPI/WarrantyController.php
View file

@ -9,6 +9,7 @@ use Catalyst\ApiBundle\Component\Response as ApiResponse;
use App\Entity\Warranty;
use App\Entity\WarrantySerial;
use App\Entity\SAPBattery;
use App\Service\WarrantyRaffleLogger;
use App\Service\WarrantyAPILogger;
use App\Service\RisingTideGateway;
@ -75,7 +76,7 @@ class WarrantyController extends ApiController
$today = new DateTime();
$user_id = $req->query->get('api_key');
$user_id = $req->query->get('session_key');
$raffle_data = [
'user_id' => $user_id,
'serial' => $serial,
@ -297,7 +298,7 @@ class WarrantyController extends ApiController
$inv_filename = $this->handlePictureUpload($invoice, $upload_dir, $serial, 'invoice');
$wcard_filename = $this->handlePictureUpload($warr_card, $upload_dir, $serial, 'wcard');
$user_id = $req->query->get('api_key');
$user_id = $req->query->get('session_key');
$log_data = [
'plate_number' => $req->request->get('plate_num'),
'first_name' => $req->request->get('first_name'),