Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes
Conflicts: src/Controller/JobOrderController.php
This commit is contained in:
commit
214e44405c
18 changed files with 1606 additions and 207 deletions
22
.env.dist
22
.env.dist
|
|
@ -15,7 +15,7 @@ APP_SECRET=b344cd6cd151ae1d61403ed55806c5ce
|
||||||
# Configure your db driver and server_version in config/packages/doctrine.yaml
|
# Configure your db driver and server_version in config/packages/doctrine.yaml
|
||||||
DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
|
DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
|
||||||
###< doctrine/doctrine-bundle ###
|
###< doctrine/doctrine-bundle ###
|
||||||
GMAPS_API_KEY=insertgmapsapikeyhere
|
GMAPS_API_KEY=insert_gmapsapikey_here
|
||||||
|
|
||||||
# rising tide sms gateway
|
# rising tide sms gateway
|
||||||
RT_USER=rt_user
|
RT_USER=rt_user
|
||||||
|
|
@ -28,7 +28,7 @@ RT_SHORTCODE=1234
|
||||||
MQTT_IP_ADDRESS=localhost
|
MQTT_IP_ADDRESS=localhost
|
||||||
MQTT_PORT=8883
|
MQTT_PORT=8883
|
||||||
MQTT_CERT=/location/of/cert/file.crt
|
MQTT_CERT=/location/of/cert/file.crt
|
||||||
MQTT_WS_HOST=insertiphere
|
MQTT_WS_HOST=insert_ip_here
|
||||||
MQTT_WS_PORT=8083
|
MQTT_WS_PORT=8083
|
||||||
|
|
||||||
# redis client
|
# redis client
|
||||||
|
|
@ -38,20 +38,22 @@ REDIS_CLIENT_PORT=6379
|
||||||
REDIS_CLIENT_PASSWORD=foobared
|
REDIS_CLIENT_PASSWORD=foobared
|
||||||
|
|
||||||
# privacy policy ids
|
# privacy policy ids
|
||||||
POLICY_PROMO=insertpromopolicyidhere
|
POLICY_PROMO=insert_promopolicyid_here
|
||||||
POLICY_THIRD_PARTY=insertthirdpartypolicyidhere
|
POLICY_THIRD_PARTY=insert_thirdpartypolicyid_here
|
||||||
POLICY_MOBILE=insertmobilepolicyidhere
|
POLICY_MOBILE=insert_mobilepolicyid_here
|
||||||
|
|
||||||
# OTP
|
# OTP
|
||||||
OTP_MODE=settotestorrandom
|
OTP_MODE=set_to_test_or_random
|
||||||
|
|
||||||
# geofence
|
# geofence
|
||||||
GEOFENCE_ENABLE=settotrueorfalse
|
GEOFENCE_ENABLE=set_to_true_or_false
|
||||||
|
|
||||||
# unknown manufacturer and vehicle ids
|
# unknown manufacturer and vehicle ids
|
||||||
CVU_MFG_ID=insertmfgidforunknownvehicles
|
CVU_MFG_ID=insert_mfgid_for_unknown_vehicles
|
||||||
CVU_BRAND_ID=insertbrandidforunknownvehicles
|
CVU_BRAND_ID=insert_brandid_for_unknown_vehicles
|
||||||
|
|
||||||
# country code prefix
|
# country code prefix
|
||||||
COUNTRY_CODE=+insertcountrycodehere
|
COUNTRY_CODE=+insert_country_code_here
|
||||||
|
|
||||||
|
# dashboard
|
||||||
|
DASHBOARD_ENABLE=set_to_true_or_false
|
||||||
|
|
|
||||||
|
|
@ -215,6 +215,20 @@ access_keys:
|
||||||
- id: rider.delete
|
- id: rider.delete
|
||||||
label: Delete
|
label: Delete
|
||||||
|
|
||||||
|
- id: servicecharge
|
||||||
|
label: Service Charge
|
||||||
|
acls:
|
||||||
|
- id: service_charge.menu
|
||||||
|
label: Menu
|
||||||
|
- id: service_charge.list
|
||||||
|
label: List
|
||||||
|
- id: service_charge.add
|
||||||
|
label: Add
|
||||||
|
- id: service_charge.update
|
||||||
|
label: Update
|
||||||
|
- id: service_charge.delete
|
||||||
|
label: Delete
|
||||||
|
|
||||||
- id: joborder
|
- id: joborder
|
||||||
label: Job Order
|
label: Job Order
|
||||||
acls:
|
acls:
|
||||||
|
|
|
||||||
183
config/cmb.menu.yaml
Normal file
183
config/cmb.menu.yaml
Normal file
|
|
@ -0,0 +1,183 @@
|
||||||
|
main_menu:
|
||||||
|
- id: home
|
||||||
|
acl: dashboard.menu
|
||||||
|
label: Dashboard
|
||||||
|
icon: flaticon-line-graph
|
||||||
|
- id: user
|
||||||
|
acl: user.menu
|
||||||
|
label: User
|
||||||
|
icon: flaticon-users
|
||||||
|
- id: user_list
|
||||||
|
acl: user.list
|
||||||
|
label: Users
|
||||||
|
parent: user
|
||||||
|
- id: role_list
|
||||||
|
acl: role.list
|
||||||
|
label: Roles
|
||||||
|
parent: user
|
||||||
|
|
||||||
|
- id: apiuser
|
||||||
|
acl: apiuser.menu
|
||||||
|
label: API User
|
||||||
|
icon: flaticon-users
|
||||||
|
- id: api_user_list
|
||||||
|
acl: apiuser.list
|
||||||
|
label: API Users
|
||||||
|
parent: apiuser
|
||||||
|
- id: api_role_list
|
||||||
|
acl: apirole.list
|
||||||
|
label: API Roles
|
||||||
|
parent: apiuser
|
||||||
|
|
||||||
|
- id: logistics
|
||||||
|
acl: logistics.menu
|
||||||
|
label: Logistics
|
||||||
|
icon: fa fa-truck
|
||||||
|
- id: rider_list
|
||||||
|
acl: rider.list
|
||||||
|
label: Riders
|
||||||
|
parent: logistics
|
||||||
|
- id: service_charge_list
|
||||||
|
acl: service_charge.list
|
||||||
|
label: Service Charges
|
||||||
|
parent: logistics
|
||||||
|
|
||||||
|
- id: battery
|
||||||
|
acl: battery.menu
|
||||||
|
label: Battery
|
||||||
|
icon: fa fa-battery-3
|
||||||
|
- id: battery_list
|
||||||
|
acl: battery.list
|
||||||
|
label: Batteries
|
||||||
|
parent: battery
|
||||||
|
- id: bmfg_list
|
||||||
|
acl: bmfg.list
|
||||||
|
label: Manufacturers
|
||||||
|
parent: battery
|
||||||
|
- id: bmodel_list
|
||||||
|
acl: bmodel.list
|
||||||
|
label: Models
|
||||||
|
parent: battery
|
||||||
|
- id: bsize_list
|
||||||
|
acl: bsize.list
|
||||||
|
label: Sizes
|
||||||
|
parent: battery
|
||||||
|
- id: promo_list
|
||||||
|
acl: promo.list
|
||||||
|
label: Promos
|
||||||
|
parent: battery
|
||||||
|
|
||||||
|
- id: vehicle
|
||||||
|
acl: vehicle.menu
|
||||||
|
label: Vehicle
|
||||||
|
icon: fa fa-car
|
||||||
|
- id: vehicle_list
|
||||||
|
acl: vehicle.list
|
||||||
|
label: Vehicles
|
||||||
|
parent: vehicle
|
||||||
|
- id: vmfg_list
|
||||||
|
acl: vmfg.list
|
||||||
|
label: Manufacturers
|
||||||
|
parent: vehicle
|
||||||
|
|
||||||
|
- id: location
|
||||||
|
acl: location.menu
|
||||||
|
label: Location
|
||||||
|
icon: fa fa-home
|
||||||
|
- id: outlet_list
|
||||||
|
acl: outlet.menu
|
||||||
|
label: Outlet
|
||||||
|
parent: location
|
||||||
|
- id: hub_list
|
||||||
|
acl: hub.menu
|
||||||
|
label: Hub
|
||||||
|
parent: location
|
||||||
|
- id: geofence_list
|
||||||
|
acl: geofence.menu
|
||||||
|
label: Geofence
|
||||||
|
parent: location
|
||||||
|
|
||||||
|
|
||||||
|
- id: joborder
|
||||||
|
acl: joborder.menu
|
||||||
|
label: Job Order
|
||||||
|
icon: flaticon-calendar-3
|
||||||
|
- id: jo_onestep_form
|
||||||
|
acl: jo_onestep.form
|
||||||
|
label: One-step Process
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_walkin_form
|
||||||
|
acl: jo_walkin.form
|
||||||
|
label: Walk-in
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_fulfill
|
||||||
|
acl: jo_fulfill.list
|
||||||
|
label: Fulfillment
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_open
|
||||||
|
acl: jo_open.list
|
||||||
|
label: Open
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_all
|
||||||
|
acl: jo_all.list
|
||||||
|
label: View All
|
||||||
|
parent: joborder
|
||||||
|
|
||||||
|
- id: support
|
||||||
|
acl: support.menu
|
||||||
|
label: Customer Support
|
||||||
|
icon: flaticon-support
|
||||||
|
- id: customer_list
|
||||||
|
acl: customer.list
|
||||||
|
label: Customers
|
||||||
|
parent: support
|
||||||
|
- id: ticket_list
|
||||||
|
acl: ticket.list
|
||||||
|
label: Tickets
|
||||||
|
parent: support
|
||||||
|
- id: general_search
|
||||||
|
acl: general.search
|
||||||
|
label: Search
|
||||||
|
parent: support
|
||||||
|
- id: warranty_search
|
||||||
|
acl: warranty.search
|
||||||
|
label: Customer Battery Search
|
||||||
|
parent: support
|
||||||
|
- id: privacy_policy_list
|
||||||
|
acl: privacy_policy.list
|
||||||
|
label: Privacy Policy
|
||||||
|
parent: support
|
||||||
|
- id: warranty_list
|
||||||
|
acl: warranty.list
|
||||||
|
label: Warranty
|
||||||
|
parent: support
|
||||||
|
- id: warranty_upload
|
||||||
|
acl: warranty.upload
|
||||||
|
label: Warranty Upload
|
||||||
|
parent: support
|
||||||
|
- id: static_content_list
|
||||||
|
acl: static_content.list
|
||||||
|
label: Static Content
|
||||||
|
parent: support
|
||||||
|
|
||||||
|
- id: service
|
||||||
|
acl: service.menu
|
||||||
|
label: Other Services
|
||||||
|
icon: flaticon-squares
|
||||||
|
- id: service_list
|
||||||
|
acl: service.list
|
||||||
|
label: Services
|
||||||
|
parent: service
|
||||||
|
|
||||||
|
- id: partner
|
||||||
|
acl: partner.menu
|
||||||
|
label: Partners
|
||||||
|
icon: flaticon-network
|
||||||
|
- id: partner_list
|
||||||
|
acl: partner.list
|
||||||
|
label: Partners
|
||||||
|
parent: partner
|
||||||
|
- id: review_list
|
||||||
|
acl: review.list
|
||||||
|
label: Reviews
|
||||||
|
parent: partner
|
||||||
|
|
@ -37,6 +37,10 @@ main_menu:
|
||||||
acl: rider.list
|
acl: rider.list
|
||||||
label: Riders
|
label: Riders
|
||||||
parent: logistics
|
parent: logistics
|
||||||
|
- id: service_charge_list
|
||||||
|
acl: service_charge.list
|
||||||
|
label: Service Charges
|
||||||
|
parent: logistics
|
||||||
|
|
||||||
- id: battery
|
- id: battery
|
||||||
acl: battery.menu
|
acl: battery.menu
|
||||||
|
|
@ -106,18 +110,6 @@ main_menu:
|
||||||
acl: jo_walkin.form
|
acl: jo_walkin.form
|
||||||
label: Walk-in
|
label: Walk-in
|
||||||
parent: joborder
|
parent: joborder
|
||||||
- id: jo_in
|
|
||||||
acl: jo_in.list
|
|
||||||
label: Incoming
|
|
||||||
parent: joborder
|
|
||||||
- id: jo_proc
|
|
||||||
acl: jo_proc.list
|
|
||||||
label: Dispatch
|
|
||||||
parent: joborder
|
|
||||||
- id: jo_assign
|
|
||||||
acl: jo_assign.list
|
|
||||||
label: Rider Assignment
|
|
||||||
parent: joborder
|
|
||||||
- id: jo_fulfill
|
- id: jo_fulfill
|
||||||
acl: jo_fulfill.list
|
acl: jo_fulfill.list
|
||||||
label: Fulfillment
|
label: Fulfillment
|
||||||
|
|
|
||||||
|
|
@ -6,3 +6,4 @@ twig:
|
||||||
gmaps_api_key: "%env(GMAPS_API_KEY)%"
|
gmaps_api_key: "%env(GMAPS_API_KEY)%"
|
||||||
mqtt_host: "%env(MQTT_WS_HOST)%"
|
mqtt_host: "%env(MQTT_WS_HOST)%"
|
||||||
mqtt_port: "%env(MQTT_WS_PORT)%"
|
mqtt_port: "%env(MQTT_WS_PORT)%"
|
||||||
|
dashboard_enable: "%env(DASHBOARD_ENABLE)%"
|
||||||
|
|
|
||||||
183
config/resq.menu.yaml
Normal file
183
config/resq.menu.yaml
Normal file
|
|
@ -0,0 +1,183 @@
|
||||||
|
main_menu:
|
||||||
|
- id: home
|
||||||
|
acl: dashboard.menu
|
||||||
|
label: Dashboard
|
||||||
|
icon: flaticon-line-graph
|
||||||
|
- id: user
|
||||||
|
acl: user.menu
|
||||||
|
label: User
|
||||||
|
icon: flaticon-users
|
||||||
|
- id: user_list
|
||||||
|
acl: user.list
|
||||||
|
label: Users
|
||||||
|
parent: user
|
||||||
|
- id: role_list
|
||||||
|
acl: role.list
|
||||||
|
label: Roles
|
||||||
|
parent: user
|
||||||
|
|
||||||
|
- id: apiuser
|
||||||
|
acl: apiuser.menu
|
||||||
|
label: API User
|
||||||
|
icon: flaticon-users
|
||||||
|
- id: api_user_list
|
||||||
|
acl: apiuser.list
|
||||||
|
label: API Users
|
||||||
|
parent: apiuser
|
||||||
|
- id: api_role_list
|
||||||
|
acl: apirole.list
|
||||||
|
label: API Roles
|
||||||
|
parent: apiuser
|
||||||
|
|
||||||
|
- id: logistics
|
||||||
|
acl: logistics.menu
|
||||||
|
label: Logistics
|
||||||
|
icon: fa fa-truck
|
||||||
|
- id: rider_list
|
||||||
|
acl: rider.list
|
||||||
|
label: Riders
|
||||||
|
parent: logistics
|
||||||
|
|
||||||
|
- id: battery
|
||||||
|
acl: battery.menu
|
||||||
|
label: Battery
|
||||||
|
icon: fa fa-battery-3
|
||||||
|
- id: battery_list
|
||||||
|
acl: battery.list
|
||||||
|
label: Batteries
|
||||||
|
parent: battery
|
||||||
|
- id: bmfg_list
|
||||||
|
acl: bmfg.list
|
||||||
|
label: Manufacturers
|
||||||
|
parent: battery
|
||||||
|
- id: bmodel_list
|
||||||
|
acl: bmodel.list
|
||||||
|
label: Models
|
||||||
|
parent: battery
|
||||||
|
- id: bsize_list
|
||||||
|
acl: bsize.list
|
||||||
|
label: Sizes
|
||||||
|
parent: battery
|
||||||
|
- id: promo_list
|
||||||
|
acl: promo.list
|
||||||
|
label: Promos
|
||||||
|
parent: battery
|
||||||
|
|
||||||
|
- id: vehicle
|
||||||
|
acl: vehicle.menu
|
||||||
|
label: Vehicle
|
||||||
|
icon: fa fa-car
|
||||||
|
- id: vehicle_list
|
||||||
|
acl: vehicle.list
|
||||||
|
label: Vehicles
|
||||||
|
parent: vehicle
|
||||||
|
- id: vmfg_list
|
||||||
|
acl: vmfg.list
|
||||||
|
label: Manufacturers
|
||||||
|
parent: vehicle
|
||||||
|
|
||||||
|
- id: location
|
||||||
|
acl: location.menu
|
||||||
|
label: Location
|
||||||
|
icon: fa fa-home
|
||||||
|
- id: outlet_list
|
||||||
|
acl: outlet.menu
|
||||||
|
label: Outlet
|
||||||
|
parent: location
|
||||||
|
- id: hub_list
|
||||||
|
acl: hub.menu
|
||||||
|
label: Hub
|
||||||
|
parent: location
|
||||||
|
- id: geofence_list
|
||||||
|
acl: geofence.menu
|
||||||
|
label: Geofence
|
||||||
|
parent: location
|
||||||
|
|
||||||
|
|
||||||
|
- id: joborder
|
||||||
|
acl: joborder.menu
|
||||||
|
label: Job Order
|
||||||
|
icon: flaticon-calendar-3
|
||||||
|
- id: jo_in
|
||||||
|
acl: jo_in.list
|
||||||
|
label: Incoming
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_proc
|
||||||
|
acl: jo_proc.list
|
||||||
|
label: Dispatch
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_assign
|
||||||
|
acl: jo_assign.list
|
||||||
|
label: Rider Assignment
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_fulfill
|
||||||
|
acl: jo_fulfill.list
|
||||||
|
label: Fulfillment
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_open
|
||||||
|
acl: jo_open.list
|
||||||
|
label: Open
|
||||||
|
parent: joborder
|
||||||
|
- id: jo_all
|
||||||
|
acl: jo_all.list
|
||||||
|
label: View All
|
||||||
|
parent: joborder
|
||||||
|
|
||||||
|
- id: support
|
||||||
|
acl: support.menu
|
||||||
|
label: Customer Support
|
||||||
|
icon: flaticon-support
|
||||||
|
- id: customer_list
|
||||||
|
acl: customer.list
|
||||||
|
label: Customers
|
||||||
|
parent: support
|
||||||
|
- id: ticket_list
|
||||||
|
acl: ticket.list
|
||||||
|
label: Tickets
|
||||||
|
parent: support
|
||||||
|
- id: general_search
|
||||||
|
acl: general.search
|
||||||
|
label: Search
|
||||||
|
parent: support
|
||||||
|
- id: warranty_search
|
||||||
|
acl: warranty.search
|
||||||
|
label: Customer Battery Search
|
||||||
|
parent: support
|
||||||
|
- id: privacy_policy_list
|
||||||
|
acl: privacy_policy.list
|
||||||
|
label: Privacy Policy
|
||||||
|
parent: support
|
||||||
|
- id: warranty_list
|
||||||
|
acl: warranty.list
|
||||||
|
label: Warranty
|
||||||
|
parent: support
|
||||||
|
- id: warranty_upload
|
||||||
|
acl: warranty.upload
|
||||||
|
label: Warranty Upload
|
||||||
|
parent: support
|
||||||
|
- id: static_content_list
|
||||||
|
acl: static_content.list
|
||||||
|
label: Static Content
|
||||||
|
parent: support
|
||||||
|
|
||||||
|
- id: service
|
||||||
|
acl: service.menu
|
||||||
|
label: Other Services
|
||||||
|
icon: flaticon-squares
|
||||||
|
- id: service_list
|
||||||
|
acl: service.list
|
||||||
|
label: Services
|
||||||
|
parent: service
|
||||||
|
|
||||||
|
- id: partner
|
||||||
|
acl: partner.menu
|
||||||
|
label: Partners
|
||||||
|
icon: flaticon-network
|
||||||
|
- id: partner_list
|
||||||
|
acl: partner.list
|
||||||
|
label: Partners
|
||||||
|
parent: partner
|
||||||
|
- id: review_list
|
||||||
|
acl: review.list
|
||||||
|
label: Reviews
|
||||||
|
parent: partner
|
||||||
34
config/routes/service_charge.yaml
Normal file
34
config/routes/service_charge.yaml
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
service_charge_list:
|
||||||
|
path: /service_charges
|
||||||
|
controller: App\Controller\ServiceChargeController::index
|
||||||
|
|
||||||
|
service_charge_rows:
|
||||||
|
path: /service_charges/rows
|
||||||
|
controller: App\Controller\ServiceChargeController::rows
|
||||||
|
methods: [POST]
|
||||||
|
|
||||||
|
service_charge_create:
|
||||||
|
path: /service_charges/create
|
||||||
|
controller: App\Controller\ServiceChargeController::addForm
|
||||||
|
methods: [GET]
|
||||||
|
|
||||||
|
service_charge_create_submit:
|
||||||
|
path: /service_charges/create
|
||||||
|
controller: App\Controller\ServiceChargeController::addSubmit
|
||||||
|
methods: [POST]
|
||||||
|
|
||||||
|
service_charge_update:
|
||||||
|
path: /service_charges/{id}
|
||||||
|
controller: App\Controller\ServiceChargeController::updateForm
|
||||||
|
methods: [GET]
|
||||||
|
|
||||||
|
service_charge_update_submit:
|
||||||
|
path: /service_charges/{id}
|
||||||
|
controller: App\Controller\ServiceChargeController::updateSubmit
|
||||||
|
methods: [POST]
|
||||||
|
|
||||||
|
service_charge_delete:
|
||||||
|
path: /service_charges/{id}
|
||||||
|
controller: App\Controller\ServiceChargeController::destroy
|
||||||
|
methods: [DELETE]
|
||||||
|
|
||||||
|
|
@ -432,7 +432,7 @@ class JobOrderController extends Controller
|
||||||
* @Menu(selected="jo_fulfill")
|
* @Menu(selected="jo_fulfill")
|
||||||
*/
|
*/
|
||||||
public function fulfillmentForm(JobOrderHandlerInterface $jo_handler, $id,
|
public function fulfillmentForm(JobOrderHandlerInterface $jo_handler, $id,
|
||||||
GISManagerInterface $gis)
|
GISManagerInterface $gis, EntityManagerInterface $em)
|
||||||
{
|
{
|
||||||
$this->denyAccessUnlessGranted('jo_fulfill.list', null, 'No access.');
|
$this->denyAccessUnlessGranted('jo_fulfill.list', null, 'No access.');
|
||||||
|
|
||||||
|
|
@ -445,6 +445,8 @@ class JobOrderController extends Controller
|
||||||
throw $this->createNotFoundException($e->getMessage());
|
throw $this->createNotFoundException($e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll();
|
||||||
|
$params['vmakes'] = $em->getRepository(Vehicle::class)->findAll();
|
||||||
$params['submit_url'] = $this->generateUrl('jo_fulfill_submit', ['id' => $id]);
|
$params['submit_url'] = $this->generateUrl('jo_fulfill_submit', ['id' => $id]);
|
||||||
$params['return_url'] = $this->generateUrl('jo_fulfill');
|
$params['return_url'] = $this->generateUrl('jo_fulfill');
|
||||||
$params['map_js_file'] = $gis->getJSJOFile();
|
$params['map_js_file'] = $gis->getJSJOFile();
|
||||||
|
|
|
||||||
268
src/Controller/ServiceChargeController.php
Normal file
268
src/Controller/ServiceChargeController.php
Normal file
|
|
@ -0,0 +1,268 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Controller;
|
||||||
|
|
||||||
|
use App\Entity\ServiceCharge;
|
||||||
|
|
||||||
|
use Doctrine\ORM\Query;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\Validator\Validator\ValidatorInterface;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
||||||
|
|
||||||
|
use Catalyst\MenuBundle\Annotation\Menu;
|
||||||
|
|
||||||
|
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
|
||||||
|
|
||||||
|
class ServiceChargeController extends Controller
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @Menu(selected="service_charge_list")
|
||||||
|
*/
|
||||||
|
public function index()
|
||||||
|
{
|
||||||
|
$this->denyAccessUnlessGranted('service_charge.list', null, 'No access.');
|
||||||
|
|
||||||
|
return $this->render('service-charge/list.html.twig');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rows(Request $req)
|
||||||
|
{
|
||||||
|
$this->denyAccessUnlessGranted('service_charge.list', null, 'No access.');
|
||||||
|
|
||||||
|
// build query
|
||||||
|
$qb = $this->getDoctrine()
|
||||||
|
->getRepository(ServiceCharge::class)
|
||||||
|
->createQueryBuilder('q');
|
||||||
|
|
||||||
|
// get datatable params
|
||||||
|
$datatable = $req->request->get('datatable');
|
||||||
|
|
||||||
|
// count total records
|
||||||
|
$tquery = $qb->select('COUNT(q)');
|
||||||
|
|
||||||
|
// add fitlers to count query
|
||||||
|
$this->setQueryFilters($datatable, $tquery);
|
||||||
|
|
||||||
|
$total = $tquery->getQuery()
|
||||||
|
->getSingleScalarResult();
|
||||||
|
|
||||||
|
// get current page number
|
||||||
|
$page = $datatable['pagination']['page'] ?? 1;
|
||||||
|
|
||||||
|
$perpage = $datatable['pagination']['perpage'];
|
||||||
|
$offset = ($page - 1) * $perpage;
|
||||||
|
|
||||||
|
// add metadata
|
||||||
|
$meta = [
|
||||||
|
'page' => $page,
|
||||||
|
'perpage' => $perpage,
|
||||||
|
'pages' => ceil($total / $perpage),
|
||||||
|
'total' => $total,
|
||||||
|
'sort' => 'asc',
|
||||||
|
'field' => 'id'
|
||||||
|
];
|
||||||
|
|
||||||
|
// build query
|
||||||
|
$query = $qb->select('q');
|
||||||
|
|
||||||
|
// add filters to query
|
||||||
|
$this->setQueryFilters($datatable, $query);
|
||||||
|
|
||||||
|
// check if sorting is present, otherwise use default
|
||||||
|
if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
|
||||||
|
$order = $datatable['sort']['sort'] ?? 'asc';
|
||||||
|
$query->orderBy('q.' . $datatable['sort']['field'], $order);
|
||||||
|
} else {
|
||||||
|
$query->orderBy('q.id', 'asc');
|
||||||
|
}
|
||||||
|
|
||||||
|
// get rows for this page
|
||||||
|
$obj_rows = $query->setFirstResult($offset)
|
||||||
|
->setMaxResults($perpage)
|
||||||
|
->getQuery()
|
||||||
|
->getResult();
|
||||||
|
|
||||||
|
// process rows
|
||||||
|
$rows = [];
|
||||||
|
foreach ($obj_rows as $orow) {
|
||||||
|
// add row data
|
||||||
|
$row['id'] = $orow->getID();
|
||||||
|
$row['name'] = $orow->getName();
|
||||||
|
|
||||||
|
// add row metadata
|
||||||
|
$row['meta'] = [
|
||||||
|
'update_url' => '',
|
||||||
|
'delete_url' => ''
|
||||||
|
];
|
||||||
|
|
||||||
|
// add crud urls
|
||||||
|
if ($this->isGranted('service_charge.update'))
|
||||||
|
$row['meta']['update_url'] = $this->generateUrl('service_charge_update', ['id' => $row['id']]);
|
||||||
|
if ($this->isGranted('service.delete'))
|
||||||
|
$row['meta']['delete_url'] = $this->generateUrl('service_charge_delete', ['id' => $row['id']]);
|
||||||
|
|
||||||
|
$rows[] = $row;
|
||||||
|
}
|
||||||
|
|
||||||
|
// response
|
||||||
|
return $this->json([
|
||||||
|
'meta' => $meta,
|
||||||
|
'data' => $rows
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Menu(selected="service_charge_list")
|
||||||
|
*/
|
||||||
|
public function addForm()
|
||||||
|
{
|
||||||
|
$this->denyAccessUnlessGranted('service_charge.add', null, 'No access.');
|
||||||
|
|
||||||
|
$params = [];
|
||||||
|
$params['obj'] = new ServiceCharge();
|
||||||
|
$params['mode'] = 'create';
|
||||||
|
|
||||||
|
// response
|
||||||
|
return $this->render('service-charge/form.html.twig', $params);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addSubmit(Request $req, ValidatorInterface $validator, EntityManagerInterface $em)
|
||||||
|
{
|
||||||
|
$this->denyAccessUnlessGranted('service_charge.add', null, 'No access.');
|
||||||
|
|
||||||
|
// create new object
|
||||||
|
$row = new ServiceCharge();
|
||||||
|
|
||||||
|
// set and save values
|
||||||
|
$row->setName($req->request->get('name'));
|
||||||
|
$row->setAmount($req->request->get('amount'));
|
||||||
|
|
||||||
|
// validate
|
||||||
|
$errors = $validator->validate($row);
|
||||||
|
|
||||||
|
// initialize error list
|
||||||
|
$error_array = [];
|
||||||
|
|
||||||
|
// add errors to list
|
||||||
|
foreach ($errors as $error) {
|
||||||
|
$error_array[$error->getPropertyPath()] = $error->getMessage();
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if any errors were found
|
||||||
|
if (!empty($error_array)) {
|
||||||
|
// return validation failure response
|
||||||
|
return $this->json([
|
||||||
|
'success' => false,
|
||||||
|
'errors' => $error_array
|
||||||
|
], 422);
|
||||||
|
} else {
|
||||||
|
// validated! save the entity
|
||||||
|
$em->persist($row);
|
||||||
|
$em->flush();
|
||||||
|
|
||||||
|
// return successful response
|
||||||
|
return $this->json([
|
||||||
|
'success' => 'Changes have been saved!'
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Menu(selected="service_charge_list")
|
||||||
|
* @ParamConverter("sc", class="App\Entity\ServiceCharge")
|
||||||
|
*/
|
||||||
|
public function updateForm(ServiceCharge $sc)
|
||||||
|
{
|
||||||
|
$this->denyAccessUnlessGranted('service_charge.update', null, 'No access.');
|
||||||
|
|
||||||
|
$params = [];
|
||||||
|
$params['mode'] = 'update';
|
||||||
|
|
||||||
|
if ($sc == null)
|
||||||
|
throw $this->createNotFoundException('The item does not exist');
|
||||||
|
|
||||||
|
$params['obj'] = $sc;
|
||||||
|
|
||||||
|
// response
|
||||||
|
return $this->render('service-charge/form.html.twig', $params);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @ParamConverter("sc", class="App\Entity\ServiceCharge")
|
||||||
|
*/
|
||||||
|
public function updateSubmit(Request $req, ValidatorInterface $validator,
|
||||||
|
ServiceCharge $sc, EntityManagerInterface $em)
|
||||||
|
{
|
||||||
|
$this->denyAccessUnlessGranted('service_charge.update', null, 'No access.');
|
||||||
|
|
||||||
|
// make sure this row exists
|
||||||
|
if ($sc == null)
|
||||||
|
throw $this->createNotFoundException('The item does not exist');
|
||||||
|
|
||||||
|
// set and save values
|
||||||
|
$sc->setName($req->request->get('name'));
|
||||||
|
$sc->setAmount($req->request->get('amount'));
|
||||||
|
|
||||||
|
// validate
|
||||||
|
$errors = $validator->validate($sc);
|
||||||
|
|
||||||
|
// initialize error list
|
||||||
|
$error_array = [];
|
||||||
|
|
||||||
|
// add errors to list
|
||||||
|
foreach ($errors as $error) {
|
||||||
|
$error_array[$error->getPropertyPath()] = $error->getMessage();
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if any errors were found
|
||||||
|
if (!empty($error_array)) {
|
||||||
|
// return validation failure response
|
||||||
|
return $this->json([
|
||||||
|
'success' => false,
|
||||||
|
'errors' => $error_array
|
||||||
|
], 422);
|
||||||
|
} else {
|
||||||
|
// validated! save the entity
|
||||||
|
$em->flush();
|
||||||
|
|
||||||
|
// return successful response
|
||||||
|
return $this->json([
|
||||||
|
'success' => 'Changes have been saved!'
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Menu(selected="service_list")
|
||||||
|
* @ParamConverter("sc", class="App\Entity\ServiceCharge")
|
||||||
|
*/
|
||||||
|
public function destroy(ServiceCharge $sc, EntityManagerInterface $em)
|
||||||
|
{
|
||||||
|
$this->denyAccessUnlessGranted('service_charge.delete', null, 'No access.');
|
||||||
|
|
||||||
|
$params = [];
|
||||||
|
|
||||||
|
if ($sc == null)
|
||||||
|
throw $this->createNotFoundException('The item does not exist');
|
||||||
|
|
||||||
|
// delete this row
|
||||||
|
$em->remove($sc);
|
||||||
|
$em->flush();
|
||||||
|
|
||||||
|
// response
|
||||||
|
$response = new Response();
|
||||||
|
$response->setStatusCode(Response::HTTP_OK);
|
||||||
|
$response->send();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function setQueryFilters($datatable, &$query)
|
||||||
|
{
|
||||||
|
if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
|
||||||
|
$query->where('q.name LIKE :filter')
|
||||||
|
->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
namespace App\Entity;
|
namespace App\Entity;
|
||||||
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Validator\Constraints as Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Entity
|
* @ORM\Entity
|
||||||
|
|
@ -21,6 +22,7 @@ class ServiceCharge
|
||||||
// name
|
// name
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="string", length=80)
|
* @ORM\Column(type="string", length=80)
|
||||||
|
* @Assert\NotBlank()
|
||||||
*/
|
*/
|
||||||
protected $name;
|
protected $name;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1387,12 +1387,13 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
||||||
{
|
{
|
||||||
$params['obj'] = new JobOrder();
|
$params['obj'] = new JobOrder();
|
||||||
$params['mode'] = 'onestep';
|
$params['mode'] = 'onestep';
|
||||||
|
$params['jo_service_charges'] = [];
|
||||||
|
|
||||||
$this->fillDropdownParameters($params);
|
$this->fillDropdownParameters($params);
|
||||||
$this->fillFormTags($params);
|
$this->fillFormTags($params);
|
||||||
|
|
||||||
// get template to display
|
// get template to display
|
||||||
$params['template'] = $this->getTwigTemplate('jo_onestep');
|
$params['template'] = $this->getTwigTemplate('jo_onestep_form');
|
||||||
|
|
||||||
// return params
|
// return params
|
||||||
return $params;
|
return $params;
|
||||||
|
|
@ -1407,7 +1408,22 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
||||||
$params['mode'] = 'onestep-edit';
|
$params['mode'] = 'onestep-edit';
|
||||||
$params['cvid'] = $obj->getCustomerVehicle()->getID();
|
$params['cvid'] = $obj->getCustomerVehicle()->getID();
|
||||||
$params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID();
|
$params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID();
|
||||||
$params['jo_service_charges'] = $obj->getMeta('service_charges');
|
|
||||||
|
// get service charges
|
||||||
|
$sc_array = [];
|
||||||
|
$jo_service_charges = $obj->getMeta('service_charges');
|
||||||
|
if (!(empty($jo_service_charges)))
|
||||||
|
{
|
||||||
|
foreach ($jo_service_charges as $jo_sc_id)
|
||||||
|
{
|
||||||
|
// find service charge
|
||||||
|
$sc_obj = $em->getRepository(ServiceCharge::class)->find($jo_sc_id);
|
||||||
|
|
||||||
|
$sc_array[] = $sc_obj;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$params['jo_service_charges'] = $sc_array;
|
||||||
|
|
||||||
$this->fillDropdownParameters($params);
|
$this->fillDropdownParameters($params);
|
||||||
$this->fillFormTags($params);
|
$this->fillFormTags($params);
|
||||||
|
|
@ -1517,7 +1533,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
||||||
{
|
{
|
||||||
$em = $this->em;
|
$em = $this->em;
|
||||||
|
|
||||||
$params['mode'] = 'update-all';
|
$params['mode'] = 'view-all';
|
||||||
|
|
||||||
// get row data
|
// get row data
|
||||||
$obj = $em->getRepository(JobOrder::class)->find($id);
|
$obj = $em->getRepository(JobOrder::class)->find($id);
|
||||||
|
|
@ -1529,8 +1545,12 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
||||||
$this->fillDropdownParameters($params);
|
$this->fillDropdownParameters($params);
|
||||||
$this->fillFormTags($params);
|
$this->fillFormTags($params);
|
||||||
|
|
||||||
// get template to display
|
// get template to display
|
||||||
$params['template'] = $this->getTwigTemplate('jo_all_form');
|
// check transaction origin if walkin
|
||||||
|
if ($obj->getSource() == TransactionOrigin::WALK_IN)
|
||||||
|
$params['template'] = $this->getTwigTemplate('jo_walkin_form');
|
||||||
|
else
|
||||||
|
$params['template'] = $this->getTwigTemplate('jo_onestep_form');
|
||||||
|
|
||||||
$params['obj'] = $obj;
|
$params['obj'] = $obj;
|
||||||
$params['status_cancelled'] = JOStatus::CANCELLED;
|
$params['status_cancelled'] = JOStatus::CANCELLED;
|
||||||
|
|
@ -2381,7 +2401,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
||||||
$this->fillFormTags($params);
|
$this->fillFormTags($params);
|
||||||
|
|
||||||
// get template to display
|
// get template to display
|
||||||
$params['template'] = $this->getTwigTemplate('jo_walkin');
|
$params['template'] = $this->getTwigTemplate('jo_walkin_form');
|
||||||
|
|
||||||
// return params
|
// return params
|
||||||
return $params;
|
return $params;
|
||||||
|
|
@ -2667,7 +2687,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
||||||
$this->fillFormTags($params);
|
$this->fillFormTags($params);
|
||||||
|
|
||||||
// get template to display
|
// get template to display
|
||||||
$params['template'] = $this->getTwigTemplate('jo_walkin_edit');
|
$params['template'] = $this->getTwigTemplate('jo_walkin_edit_form');
|
||||||
|
|
||||||
// return params
|
// return params
|
||||||
return $params;
|
return $params;
|
||||||
|
|
@ -2775,24 +2795,16 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
|
||||||
// $this->template_hash = [
|
// $this->template_hash = [
|
||||||
// 'blah' => 'blah',
|
// 'blah' => 'blah',
|
||||||
// ];
|
// ];
|
||||||
$this->template_hash['jo_incoming_form'] = 'job-order/cmb.form.html.twig';
|
|
||||||
$this->template_hash['jo_open_edit_form'] = 'job-order/cmb.form.html.twig';
|
|
||||||
$this->template_hash['jo_incoming_vehicle_form'] = 'job-order/cmb.form.html.twig';
|
$this->template_hash['jo_incoming_vehicle_form'] = 'job-order/cmb.form.html.twig';
|
||||||
$this->template_hash['jo_processing_form'] = 'job-order/cmb.form.html.twig';
|
$this->template_hash['jo_fulfillment_form'] = 'job-order/cmb.form.onestep.html.twig';
|
||||||
$this->template_hash['jo_assigning_form'] = 'job-order/cmb.form.html.twig';
|
$this->template_hash['jo_all_form'] = 'job-order/cmb.form.onestep.html.twig';
|
||||||
$this->template_hash['jo_fulfillment_form'] = 'job-order/cmb.form.html.twig';
|
$this->template_hash['jo_list_fulfillment'] = 'job-order/cmb.list.fulfillment.html.twig';
|
||||||
$this->template_hash['jo_open_hub_form'] = 'job-order/cmb.form.html.twig';
|
$this->template_hash['jo_list_open'] = 'job-order/cmb.list.open.html.twig';
|
||||||
$this->template_hash['jo_open_rider_form'] = 'job-order/cmb.form.html.twig';
|
|
||||||
$this->template_hash['jo_all_form'] = 'job-order/cmb.form.html.twig';
|
|
||||||
$this->template_hash['jo_list_processing'] = 'job-order/list.processing.html.twig';
|
|
||||||
$this->template_hash['jo_list_assigning'] = 'job-order/list.assigning.html.twig';
|
|
||||||
$this->template_hash['jo_list_fulfillment'] = 'job-order/list.fulfillment.html.twig';
|
|
||||||
$this->template_hash['jo_list_open'] = 'job-order/list.open.html.twig';
|
|
||||||
$this->template_hash['jo_list_all'] = 'job-order/list.all.html.twig';
|
$this->template_hash['jo_list_all'] = 'job-order/list.all.html.twig';
|
||||||
$this->template_hash['jo_onestep'] = 'job-order/cmb.form.onestep.html.twig';
|
$this->template_hash['jo_onestep_form'] = 'job-order/cmb.form.onestep.html.twig';
|
||||||
$this->template_hash['jo_onestep_edit_form'] = 'job-order/cmb.form.onestep.html.twig';
|
$this->template_hash['jo_onestep_edit_form'] = 'job-order/cmb.form.onestep.html.twig';
|
||||||
$this->template_hash['jo_walkin'] = 'job-order/cmb.form.walkin.html.twig';
|
$this->template_hash['jo_walkin_form'] = 'job-order/cmb.form.walkin.html.twig';
|
||||||
$this->template_hash['jo_walkin_edit'] = 'job-order/cmb.form.walkin.html.twig';
|
$this->template_hash['jo_walkin_edit_form'] = 'job-order/cmb.form.walkin.html.twig';
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function checkTier($tier)
|
protected function checkTier($tier)
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,9 @@
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.1/mqttws31.min.js" type="text/javascript"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.1/mqttws31.min.js" type="text/javascript"></script>
|
||||||
<script src="{{ asset('assets/js/dashboard_map.js') }}"></script>
|
<script src="{{ asset('assets/js/dashboard_map.js') }}"></script>
|
||||||
<script src="{{ asset('assets/js/map_mqtt.js') }}"></script>
|
<script src="{{ asset('assets/js/map_mqtt.js') }}"></script>
|
||||||
{{ include('map/' ~ map_js_file) }}
|
{% if dashboard_enable == 'true' %}
|
||||||
|
{{ include('map/' ~ map_js_file) }}
|
||||||
|
{% endif %}
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
function initMap(r_markers, c_markers, icons) {
|
function initMap(r_markers, c_markers, icons) {
|
||||||
|
|
@ -58,6 +60,7 @@ function initEventHandler(dashmap) {
|
||||||
event_handler.connect('{{ app.user.getID }}', '{{ mqtt_host }}', {{ mqtt_port }});
|
event_handler.connect('{{ app.user.getID }}', '{{ mqtt_host }}', {{ mqtt_port }});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{% if dashboard_enable == 'true' %}
|
||||||
// create icons
|
// create icons
|
||||||
var icons = {
|
var icons = {
|
||||||
'rider_active_jo': L.divIcon({
|
'rider_active_jo': L.divIcon({
|
||||||
|
|
@ -80,11 +83,12 @@ var icons = {
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
var r_markers = {};
|
var r_markers = {};
|
||||||
var c_markers = {};
|
var c_markers = {};
|
||||||
|
|
||||||
var dashmap = initMap(r_markers, c_markers, icons);
|
var dashmap = initMap(r_markers, c_markers, icons);
|
||||||
initEventHandler(dashmap, icons);
|
initEventHandler(dashmap, icons);
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
||||||
|
|
@ -389,14 +389,20 @@
|
||||||
<div class="m-form__section">
|
<div class="m-form__section">
|
||||||
<div class="m-form__heading">
|
<div class="m-form__heading">
|
||||||
<h3 class="m-form__heading-title">
|
<h3 class="m-form__heading-title">
|
||||||
Nearest Hubs
|
{% if mode in ['view-all', 'update-fulfillment'] %}
|
||||||
|
Assigned Hub
|
||||||
|
{% else %}
|
||||||
|
Nearest Hubs
|
||||||
|
{% endif %}
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group m-form__group row">
|
<div class="form-group m-form__group row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<label name="hub" data-field="hub">Click on a row to select a hub
|
{% if mode != 'view-all' %}
|
||||||
<span style="color:red"> *</span>
|
<label name="hub" data-field="hub">Click on a row to select a hub
|
||||||
</label>
|
<span style="color:red"> *</span>
|
||||||
|
</label>
|
||||||
|
{% endif %}
|
||||||
<div class="form-control-feedback hide" data-field="hub"></div>
|
<div class="form-control-feedback hide" data-field="hub"></div>
|
||||||
<input type="hidden" id="hub-field" name="hub_id" value="">
|
<input type="hidden" id="hub-field" name="hub_id" value="">
|
||||||
<div class="table-frame" data-name="hub">
|
<div class="table-frame" data-name="hub">
|
||||||
|
|
@ -430,14 +436,20 @@
|
||||||
<div class="m-form__section">
|
<div class="m-form__section">
|
||||||
<div class="m-form__heading">
|
<div class="m-form__heading">
|
||||||
<h3 class="m-form__heading-title">
|
<h3 class="m-form__heading-title">
|
||||||
Rider Assignment
|
{% if mode in ['view-all', 'update-fulfillment'] %}
|
||||||
|
Assigned Rider
|
||||||
|
{% else %}
|
||||||
|
Rider Assignment
|
||||||
|
{% endif %}
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group m-form__group row">
|
<div class="form-group m-form__group row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<label name="rider" data-field="rider">Click on a row to select a rider
|
{% if mode != 'view-all' %}
|
||||||
<span style="color:red"> *</span>
|
<label name="rider" data-field="rider">Click on a row to select a rider
|
||||||
</label>
|
<span style="color:red"> *</span>
|
||||||
|
</label>
|
||||||
|
{% endif %}
|
||||||
<div class="form-control-feedback hide" data-field="rider"></div>
|
<div class="form-control-feedback hide" data-field="rider"></div>
|
||||||
<input type="hidden" id="rider-field" name="rider_id" value="">
|
<input type="hidden" id="rider-field" name="rider_id" value="">
|
||||||
<div class="table-frame" data-name="rider">
|
<div class="table-frame" data-name="rider">
|
||||||
|
|
@ -452,7 +464,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="riders">
|
<tbody id="riders">
|
||||||
{% if mode in ['onestep-edit'] %}
|
{% if mode in ['onestep-edit', 'view-all', 'update-fulfillment'] %}
|
||||||
{% set avail_riders = obj.getHub.getAvailableRiders|default([]) %}
|
{% set avail_riders = obj.getHub.getAvailableRiders|default([]) %}
|
||||||
<tr class="placeholder-row{{ obj.getHub and avail_riders|length > 0 ? ' hide' }}">
|
<tr class="placeholder-row{{ obj.getHub and avail_riders|length > 0 ? ' hide' }}">
|
||||||
<td colspan="5">
|
<td colspan="5">
|
||||||
|
|
@ -462,7 +474,11 @@
|
||||||
|
|
||||||
{% if obj.getHub %}
|
{% if obj.getHub %}
|
||||||
{% for rider in avail_riders %}
|
{% for rider in avail_riders %}
|
||||||
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' class="m-table__row--primary"' }}">
|
{% if mode in ['view-all', 'update-fulfillment'] %}
|
||||||
|
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' ' }}">
|
||||||
|
{% else %}
|
||||||
|
<tr data-id="{{ rider.getID }}"{{ obj.getRider and obj.getRider.getID == rider.getID ? ' class="m-table__row--primary"' }}">
|
||||||
|
{% endif %}
|
||||||
<td>{{ rider.getFirstName }}</td>
|
<td>{{ rider.getFirstName }}</td>
|
||||||
<td>{{ rider.getLastName }}</td>
|
<td>{{ rider.getLastName }}</td>
|
||||||
<td>{{ rider.getContactNumber }}</td>
|
<td>{{ rider.getContactNumber }}</td>
|
||||||
|
|
@ -485,24 +501,26 @@
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="row m-form__group">
|
<div class="row m-form__group">
|
||||||
<div class="col-lg-12">
|
{% if mode != 'view-all' %}
|
||||||
<button class="btn btn-primary" id="btn-sc-add">Add Service Charge</button>
|
<div class="col-lg-12">
|
||||||
</div>
|
<button class="btn btn-primary" id="btn-sc-add">Add Service Charge</button>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<!-- TODO: loop through existing service charges for job order -->
|
<!-- loop through existing service charges for job order -->
|
||||||
{% for jo_sc_key, jo_sc in obj.getMeta('service_charges')|default([]) %}
|
{% for jo_sc in jo_service_charges %}
|
||||||
<div class="form-group m-form__group row">
|
<div class="form-group m-form__group row">
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6">
|
||||||
<div class="col-lg-12 form-group-inner">
|
<div class="col-lg-12 form-group-inner">
|
||||||
<select class="form-control m-input sc-select" name="service_charges[]">
|
<select class="form-control m-input sc-select" name="service_charges">
|
||||||
{% for key, sc in service_charges %}
|
{% for key, sc in service_charges %}
|
||||||
<option value="{{ sc.getID }}"{{ jo_sc.id == sc.getID ? ' selected' }}>{{ sc.getName }}</option>
|
<option value="{{ sc.getID }}" data-amount="{{ sc.getAmount }}"{{ jo_sc.getID == sc.getID ? ' selected' }}>{{ sc.getName }}</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-5">
|
<div class="col-lg-5">
|
||||||
<input class="form-control sc-amount" type="text" value="0" disabled>
|
<input class="form-control sc-amount" type="text" value="{{ jo_sc.getAmount }}" disabled>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-1">
|
<div class="col-lg-1">
|
||||||
<button class="btn btn-danger btn-sc-remove">X</button>
|
<button class="btn btn-danger btn-sc-remove">X</button>
|
||||||
|
|
@ -634,9 +652,11 @@
|
||||||
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<button type="submit" class="btn btn-success">Submit</button>
|
{% if mode != 'view-all' %}
|
||||||
{% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
|
<button type="submit" class="btn btn-success">{{ mode == 'update-fulfillment' ? 'Fulfill' : 'Submit' }}</button>
|
||||||
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</a>
|
{% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
|
||||||
|
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</a>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{{ return_url }}" class="btn btn-secondary">Back</a>
|
<a href="{{ return_url }}" class="btn btn-secondary">Back</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -781,6 +801,32 @@ $(function() {
|
||||||
});
|
});
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% if mode in ['view-all', 'update-fulfillment'] %}
|
||||||
|
var hub_table = '';
|
||||||
|
$.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
|
||||||
|
var hubs = data['hubs'];
|
||||||
|
var hub_marker;
|
||||||
|
for (i in hubs) {
|
||||||
|
var hub = hubs[i];
|
||||||
|
|
||||||
|
if(selected_hub == hub['id']) {
|
||||||
|
hub_table += '<tr data-id=' + hub['id'] + ' ' + '>';
|
||||||
|
hub_marker = L.marker([hub['lat'], hub['long']], { icon: icon_hub });
|
||||||
|
hubLayerGroup.addLayer(hub_marker);
|
||||||
|
|
||||||
|
hub_table += '<td>' + hub['name'] + '</td>';
|
||||||
|
hub_table += '<td>' + hub['branch'] + '</td>';
|
||||||
|
hub_table += '<td>' + hub['cnum'] + '</td>';
|
||||||
|
hub_table += '<td>' + hub['distance'] + '</td>';
|
||||||
|
hub_table += '<td></td>';
|
||||||
|
hub_table += '</tr>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#nearest_hubs').html(hub_table);
|
||||||
|
});
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
// add marker to layer group
|
// add marker to layer group
|
||||||
markerLayerGroup.addLayer(marker);
|
markerLayerGroup.addLayer(marker);
|
||||||
|
|
||||||
|
|
@ -844,76 +890,80 @@ $(function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$('#hubs-table').on('click', 'tr', function() {
|
{% if mode != 'view-all' %}
|
||||||
var id = $(this).data('id');
|
$('#hubs-table').on('click', 'tr', function() {
|
||||||
|
var id = $(this).data('id');
|
||||||
|
|
||||||
riderLayerGroup.clearLayers();
|
riderLayerGroup.clearLayers();
|
||||||
|
|
||||||
if (id != selected_hub) {
|
if (id != selected_hub) {
|
||||||
|
|
||||||
// highlight this row
|
// highlight this row
|
||||||
$('#hubs-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
|
$('#hubs-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
|
||||||
|
|
||||||
$(this).addClass('m-table__row--primary');
|
$(this).addClass('m-table__row--primary');
|
||||||
|
|
||||||
// set hub
|
// set hub
|
||||||
selected_hub = id;
|
selected_hub = id;
|
||||||
$('#hub-field').val(selected_hub);
|
$('#hub-field').val(selected_hub);
|
||||||
|
|
||||||
// clear rider field
|
// clear rider field
|
||||||
$('#rider-field').val('');
|
$('#rider-field').val('');
|
||||||
selected_rider = '';
|
selected_rider = '';
|
||||||
|
|
||||||
// get riders of hub
|
// get riders of hub
|
||||||
// get hub riders ajax
|
// get hub riders ajax
|
||||||
// TODO: add latitude and longitude of delivery location to ajax request
|
// TODO: add latitude and longitude of delivery location to ajax request
|
||||||
var rider_table = '';
|
var rider_table = '';
|
||||||
$.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) {
|
$.getJSON("{{ url('hub_riders') }}?id=" + selected_hub, function(data) {
|
||||||
var riders = data['riders'];
|
var riders = data['riders'];
|
||||||
for (i in riders) {
|
for (i in riders) {
|
||||||
var rider = riders[i];
|
var rider = riders[i];
|
||||||
var rider_lat = rider['location'][0];
|
var rider_lat = rider['location'][0];
|
||||||
var rider_lng = rider['location'][1];
|
var rider_lng = rider['location'][1];
|
||||||
var rider_marker = L.marker([rider_lat, rider_lng], { icon: icon_rider_available });
|
var rider_marker = L.marker([rider_lat, rider_lng], { icon: icon_rider_available });
|
||||||
riderLayerGroup.addLayer(rider_marker);
|
riderLayerGroup.addLayer(rider_marker);
|
||||||
|
|
||||||
rider_table += '<tr data-id=' + rider['id'] + '>';
|
rider_table += '<tr data-id=' + rider['id'] + '>';
|
||||||
rider_table += '<td>' + rider['first_name'] + '</td>';
|
rider_table += '<td>' + rider['first_name'] + '</td>';
|
||||||
rider_table += '<td>' + rider['last_name'] + '</td>';
|
rider_table += '<td>' + rider['last_name'] + '</td>';
|
||||||
rider_table += '<td>' + rider['contact_num'] + '</td>';
|
rider_table += '<td>' + rider['contact_num'] + '</td>';
|
||||||
rider_table += '<td>' + rider['plate_num'] + '</td>';
|
rider_table += '<td>' + rider['plate_num'] + '</td>';
|
||||||
rider_table += '<td></td>';
|
rider_table += '<td></td>';
|
||||||
rider_table += '</tr>';
|
rider_table += '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#riders').html(rider_table);
|
$('#riders').html(rider_table);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// unhighlight this row
|
// unhighlight this row
|
||||||
$(this).removeClass('m-table__row--primary');
|
$(this).removeClass('m-table__row--primary');
|
||||||
|
|
||||||
// remove id value
|
// remove id value
|
||||||
selected_hub = '';
|
selected_hub = '';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
{% endif %}
|
||||||
});
|
});
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$('#rider-table').on('click', 'tr', function() {
|
{% if mode != 'view-all' %}
|
||||||
var id = $(this).data('id');
|
$('#rider-table').on('click', 'tr', function() {
|
||||||
|
var id = $(this).data('id');
|
||||||
|
|
||||||
// highlight this row
|
// highlight this row
|
||||||
$('#rider-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
|
$('#rider-table').find('.m-table__row--primary').removeClass('m-table__row--primary');
|
||||||
|
|
||||||
$(this).addClass('m-table__row--primary');
|
$(this).addClass('m-table__row--primary');
|
||||||
|
|
||||||
// set rider
|
// set rider
|
||||||
selected_rider = id;
|
selected_rider = id;
|
||||||
$('#rider-field').val(selected_rider);
|
$('#rider-field').val(selected_rider);
|
||||||
});
|
});
|
||||||
|
{% endif %}
|
||||||
});
|
});
|
||||||
|
|
||||||
{% if mode in ['onestep-edit'] %}
|
{% if mode in ['onestep-edit', 'view-all', 'update-fulfillment'] %}
|
||||||
var lat = {{ obj.getCoordinates.getLatitude }};
|
var lat = {{ obj.getCoordinates.getLatitude }};
|
||||||
var lng = {{ obj.getCoordinates.getLongitude }};
|
var lng = {{ obj.getCoordinates.getLongitude }};
|
||||||
|
|
||||||
|
|
@ -1307,7 +1357,7 @@ $(function() {
|
||||||
var sc_array = [];
|
var sc_array = [];
|
||||||
|
|
||||||
// populate invoiceItems if editing so that we don't lose the battery
|
// populate invoiceItems if editing so that we don't lose the battery
|
||||||
{% if mode in ['open-edit', 'onestep-edit', 'walk-in-edit'] %}
|
{% if mode in ['view-all', 'open-edit', 'onestep-edit', 'walk-in-edit', 'update-fulfillment'] %}
|
||||||
{% if (obj.getInvoice and obj.getInvoice.getItems|length > 0) %}
|
{% if (obj.getInvoice and obj.getInvoice.getItems|length > 0) %}
|
||||||
{% for item in obj.getInvoice.getItems %}
|
{% for item in obj.getInvoice.getItems %}
|
||||||
{% if item.getBattery() %}
|
{% if item.getBattery() %}
|
||||||
|
|
@ -1369,14 +1419,13 @@ $(function() {
|
||||||
generateInvoice();
|
generateInvoice();
|
||||||
});
|
});
|
||||||
|
|
||||||
// reset the invoice table
|
// reset the invoice table
|
||||||
$("#btn-reset-invoice").click(function() {
|
$("#btn-reset-invoice").click(function() {
|
||||||
$("#invoice-discount").prop('selectedIndex', 0);
|
$("#invoice-discount").val(0);
|
||||||
$('.sc-select').closest('.row').remove();
|
$('.sc-select').closest('.row').remove();
|
||||||
invoiceItems = [];
|
invoiceItems = [];
|
||||||
sc_array = [];
|
generateInvoice();
|
||||||
generateInvoice();
|
});
|
||||||
});
|
|
||||||
|
|
||||||
// recompute
|
// recompute
|
||||||
$("#btn-recompute-invoice").click(function() {
|
$("#btn-recompute-invoice").click(function() {
|
||||||
|
|
@ -1389,8 +1438,14 @@ $(function() {
|
||||||
var stype = $("#service_type").val();
|
var stype = $("#service_type").val();
|
||||||
var cvid = $("#customer-vehicle").val();
|
var cvid = $("#customer-vehicle").val();
|
||||||
|
|
||||||
$.each(sc_array, function(index){
|
sc_array = [];
|
||||||
console.log('generateInvoice ' + this.id);
|
|
||||||
|
// get the service charges
|
||||||
|
$('.sc-select').each(function() {
|
||||||
|
var id = $(this).children('option:selected').val();
|
||||||
|
sc_array.push({
|
||||||
|
id: id,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// generate invoice values
|
// generate invoice values
|
||||||
|
|
@ -1409,39 +1464,39 @@ $(function() {
|
||||||
$("#invoice-change").val(1);
|
$("#invoice-change").val(1);
|
||||||
var invoice = response.invoice;
|
var invoice = response.invoice;
|
||||||
|
|
||||||
// populate totals
|
// populate totals
|
||||||
$("#invoice-discount").val(invoice.discount);
|
$("#invoice-discount").val(invoice.discount);
|
||||||
$("#invoice-price").val(invoice.price);
|
$("#invoice-price").val(invoice.price);
|
||||||
$("#invoice-trade-in").val(invoice.trade_in);
|
$("#invoice-trade-in").val(invoice.trade_in);
|
||||||
$("#invoice-vat").val(invoice.vat);
|
$("#invoice-vat").val(invoice.vat);
|
||||||
$("#invoice-total-amount").val(invoice.total_price);
|
$("#invoice-total-amount").val(invoice.total_price);
|
||||||
|
|
||||||
// populate rows
|
// populate rows
|
||||||
var html = '';
|
var html = '';
|
||||||
|
|
||||||
if (invoice.items.length > 0) {
|
if (invoice.items.length > 0) {
|
||||||
$.each(invoice.items, function(key, item) {
|
$.each(invoice.items, function(key, item) {
|
||||||
html += '<tr data-key="' + key + '">' +
|
html += '<tr data-key="' + key + '">' +
|
||||||
'<td>' + item.title + '</td>' +
|
'<td>' + item.title + '</td>' +
|
||||||
'<td class="text-right">' + item.quantity + '</td>' +
|
'<td class="text-right">' + item.quantity + '</td>' +
|
||||||
'<td class="text-right">' + item.unit_price + '</td>' +
|
'<td class="text-right">' + item.unit_price + '</td>' +
|
||||||
'<td class="text-right">' + item.amount + '</td>' +
|
'<td class="text-right">' + item.amount + '</td>' +
|
||||||
/*
|
/*
|
||||||
'<td><button type="button" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-invoice-delete" title="Delete"><i class="la la-trash"></i></button></td>' +
|
'<td><button type="button" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-invoice-delete" title="Delete"><i class="la la-trash"></i></button></td>' +
|
||||||
*/
|
*/
|
||||||
'</tr>';
|
'</tr>';
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
html = '<tr class="placeholder-row">' +
|
html = '<tr class="placeholder-row">' +
|
||||||
'<td colspan="4">' +
|
'<td colspan="4">' +
|
||||||
'No items to display.' +
|
'No items to display.' +
|
||||||
'</td>' +
|
'</td>' +
|
||||||
'</tr>';
|
'</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
table.html(html);
|
table.html(html);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove from invoice table
|
// remove from invoice table
|
||||||
// TODO: figure out a way to delete rows, and should deleting trade ins be allowed since they count as items on the table?
|
// TODO: figure out a way to delete rows, and should deleting trade ins be allowed since they count as items on the table?
|
||||||
|
|
@ -1677,9 +1732,6 @@ $(function() {
|
||||||
|
|
||||||
$('#sc-section').append(html);
|
$('#sc-section').append(html);
|
||||||
|
|
||||||
// clear the sc_array
|
|
||||||
sc_array.length = 0;
|
|
||||||
|
|
||||||
// trigger change in select
|
// trigger change in select
|
||||||
$('#sc-section').find('.sc-select').last().change();
|
$('#sc-section').find('.sc-select').last().change();
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -1691,16 +1743,6 @@ $(function() {
|
||||||
|
|
||||||
$(this).closest('.row').remove();
|
$(this).closest('.row').remove();
|
||||||
|
|
||||||
sc_array.length = 0;
|
|
||||||
|
|
||||||
// get the service charges
|
|
||||||
$('.sc-select').each(function() {
|
|
||||||
var id = $(this).children('option:selected').val();
|
|
||||||
sc_array.push({
|
|
||||||
id: id,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
generateInvoice();
|
generateInvoice();
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -1710,17 +1752,6 @@ $(function() {
|
||||||
var amount = $(this).children('option:selected').data('amount');
|
var amount = $(this).children('option:selected').data('amount');
|
||||||
$(this).closest('.row').find('.sc-amount').val(amount);
|
$(this).closest('.row').find('.sc-amount').val(amount);
|
||||||
|
|
||||||
// clear the sc_array
|
|
||||||
sc_array.length = 0;
|
|
||||||
|
|
||||||
// get the service charges
|
|
||||||
$('.sc-select').each(function() {
|
|
||||||
var id = $(this).children('option:selected').val();
|
|
||||||
sc_array.push({
|
|
||||||
id: id,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
generateInvoice();
|
generateInvoice();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -341,9 +341,11 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group m-form__group row">
|
<div class="form-group m-form__group row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<label name="hub" data-field="hub">Click on a row to select a hub
|
{% if mode != 'view-all' %}
|
||||||
<span style="color:red"> *</span>
|
<label name="hub" data-field="hub">Click on a row to select a hub
|
||||||
</label>
|
<span style="color:red"> *</span>
|
||||||
|
</label>
|
||||||
|
{% endif %}
|
||||||
<div class="form-control-feedback hide" data-field="hub"></div>
|
<div class="form-control-feedback hide" data-field="hub"></div>
|
||||||
<input type="hidden" id="hub-field" name="hub_id" value="">
|
<input type="hidden" id="hub-field" name="hub_id" value="">
|
||||||
<div class="table-frame" data-name="hub">
|
<div class="table-frame" data-name="hub">
|
||||||
|
|
@ -358,14 +360,23 @@
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="nearest_hubs">
|
<tbody id="nearest_hubs">
|
||||||
{% for hub in hubs %}
|
{% if mode == 'view-all' %}
|
||||||
<tr data-id="{{ hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.getID ? ' class="m-table__row--primary"' }}>
|
<tr data-id="{{ obj.getHub.getID }}"{{ obj.getHub.getID }}>
|
||||||
<td>{{ hub.getName }}</td>
|
<td>{{ obj.getHub.getName }}</td>
|
||||||
<td>{{ hub.getBranch }}</td>
|
<td>{{ obj.getHub.getBranch }}</td>
|
||||||
<td>{{ hub.getContactNumbers }}</td>
|
<td>{{ obj.getHub.getContactNumbers }}</td>
|
||||||
<td></span></td>
|
<td></span></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
{% endfor %}
|
{% else %}
|
||||||
|
{% for hub in hubs %}
|
||||||
|
<tr data-id="{{ hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.getID ? ' class="m-table__row--primary"' }}>
|
||||||
|
<td>{{ hub.getName }}</td>
|
||||||
|
<td>{{ hub.getBranch }}</td>
|
||||||
|
<td>{{ hub.getContactNumbers }}</td>
|
||||||
|
<td></span></td>
|
||||||
|
<td></td>
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -495,9 +506,11 @@
|
||||||
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<button type="submit" class="btn btn-success">Submit</button>
|
{% if mode != 'view-all' %}
|
||||||
{% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
|
<button type="submit" class="btn btn-success">Submit</button>
|
||||||
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</a>
|
{% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
|
||||||
|
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</a>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{{ return_url }}" class="btn btn-secondary">Back</a>
|
<a href="{{ return_url }}" class="btn btn-secondary">Back</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -946,12 +959,12 @@ var vdata = false;
|
||||||
generateInvoice();
|
generateInvoice();
|
||||||
});
|
});
|
||||||
|
|
||||||
// reset the invoice table
|
// reset the invoice table
|
||||||
$("#btn-reset-invoice").click(function() {
|
$("#btn-reset-invoice").click(function() {
|
||||||
$("#invoice-discount").prop('selectedIndex', 0);
|
$("#invoice-discount").val(0);
|
||||||
invoiceItems = [];
|
invoiceItems = [];
|
||||||
generateInvoice();
|
generateInvoice();
|
||||||
});
|
});
|
||||||
|
|
||||||
// recompute
|
// recompute
|
||||||
$("#btn-recompute-invoice").click(function() {
|
$("#btn-recompute-invoice").click(function() {
|
||||||
|
|
|
||||||
183
templates/job-order/cmb.list.fulfillment.html.twig
Normal file
183
templates/job-order/cmb.list.fulfillment.html.twig
Normal file
|
|
@ -0,0 +1,183 @@
|
||||||
|
{% extends 'base.html.twig' %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
<!-- BEGIN: Subheader -->
|
||||||
|
<div class="m-subheader">
|
||||||
|
<div class="d-flex align-items-center">
|
||||||
|
<div class="mr-auto">
|
||||||
|
<h3 class="m-subheader__title">
|
||||||
|
Job Orders (Fulfillment)
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END: Subheader -->
|
||||||
|
<div class="m-content">
|
||||||
|
<!--Begin::Section-->
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xl-12">
|
||||||
|
<div class="m-portlet m-portlet--mobile">
|
||||||
|
<div class="m-portlet__body">
|
||||||
|
<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
|
||||||
|
<div class="row align-items-center">
|
||||||
|
<div class="col-xl-12">
|
||||||
|
<div class="form-group m-form__group row align-items-center">
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="m-input-icon m-input-icon--left">
|
||||||
|
<input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
|
||||||
|
<span class="m-input-icon__icon m-input-icon__icon--left">
|
||||||
|
<span><i class="la la-search"></i></span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="m-input-icon m-input-icon--left">
|
||||||
|
<div>
|
||||||
|
<select class="form-control m-input" id="rider_list" name="rider_list">
|
||||||
|
<option value="">All Riders</option>
|
||||||
|
{% for rider in riders %}
|
||||||
|
<option value="{{ rider.getID }}">{{ rider.getFirstName ~ ' ' ~ rider.getLastName }} </option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="m-input-icon m-input-icon--left">
|
||||||
|
<div class="input-daterange input-group" id="date-range">
|
||||||
|
<input role="presentation" type="text" class="form-control m-input" id="date_start" name="date_start" placeholder="Start date" />
|
||||||
|
<div class="input-group-append">
|
||||||
|
<span class="input-group-text"><i class="la la-ellipsis-h"></i></span>
|
||||||
|
</div>
|
||||||
|
<input role="presentation" type="text" class="form-control" id="date_end" name="date_end" placeholder="End date" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!--begin: Datatable -->
|
||||||
|
<div id="data-rows"></div>
|
||||||
|
<!--end: Datatable -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
<script>
|
||||||
|
$(function() {
|
||||||
|
$("#date-range").datepicker({
|
||||||
|
orientation: "bottom"
|
||||||
|
});
|
||||||
|
|
||||||
|
var options = {
|
||||||
|
data: {
|
||||||
|
type: 'remote',
|
||||||
|
source: {
|
||||||
|
read: {
|
||||||
|
url: '{{ url('jo_fulfill_rows') }}',
|
||||||
|
method: 'POST'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
saveState: {
|
||||||
|
cookie: false,
|
||||||
|
webstorage: false
|
||||||
|
},
|
||||||
|
pageSize: 10,
|
||||||
|
serverPaging: true,
|
||||||
|
serverFiltering: true,
|
||||||
|
serverSorting: true
|
||||||
|
},
|
||||||
|
rows: {
|
||||||
|
beforeTemplate: function (row, data, index) {
|
||||||
|
if (data.flag_advance) {
|
||||||
|
$(row).addClass('m-table__row--danger');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
columns: [
|
||||||
|
{
|
||||||
|
field: 'id',
|
||||||
|
title: 'JO Number'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'delivery_address',
|
||||||
|
title: 'Customer Area'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'service_type',
|
||||||
|
title: 'Type of Transaction'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'type',
|
||||||
|
title: 'Schedule'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'date_schedule',
|
||||||
|
title: 'Scheduled Date'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'status',
|
||||||
|
title: 'Status'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'processor',
|
||||||
|
title: 'Dispatcher'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'Actions',
|
||||||
|
width: 110,
|
||||||
|
title: 'Actions',
|
||||||
|
sortable: false,
|
||||||
|
overflow: 'visible',
|
||||||
|
template: function (row, index, datatable) {
|
||||||
|
var actions = '<a href="' + row.meta.onestep_edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="View / Edit"><i class="la la-edit"></i></a>';
|
||||||
|
|
||||||
|
return actions;
|
||||||
|
},
|
||||||
|
}
|
||||||
|
],
|
||||||
|
search: {
|
||||||
|
onEnter: false,
|
||||||
|
input: $('#data-rows-search'),
|
||||||
|
delay: 400
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var table = $("#data-rows").mDatatable(options);
|
||||||
|
|
||||||
|
// auto refresh table
|
||||||
|
setInterval(function() {
|
||||||
|
table.reload();
|
||||||
|
}, {{ table_refresh_rate }});
|
||||||
|
|
||||||
|
|
||||||
|
$("#rider_list").on("change", function() {
|
||||||
|
console.log($(this).val());
|
||||||
|
table.search($(this).val(), "rider");
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#date_start").on("change", function() {
|
||||||
|
var date_start = $(this).val();
|
||||||
|
var date_end = $("[name='date_end']").val();
|
||||||
|
var date_array = [date_start, date_end];
|
||||||
|
|
||||||
|
table.search(date_array, "schedule_date");
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#date_end").on("change", function() {
|
||||||
|
console.log($(this).val());
|
||||||
|
|
||||||
|
var date_end = $(this).val();
|
||||||
|
var date_start = $("[name='date_start']").val();
|
||||||
|
var date_array = [date_start, date_end];
|
||||||
|
|
||||||
|
table.search(date_array, "schedule_date");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
||||||
190
templates/job-order/cmb.list.open.html.twig
Normal file
190
templates/job-order/cmb.list.open.html.twig
Normal file
|
|
@ -0,0 +1,190 @@
|
||||||
|
{% extends 'base.html.twig' %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
<!-- BEGIN: Subheader -->
|
||||||
|
<div class="m-subheader">
|
||||||
|
<div class="d-flex align-items-center">
|
||||||
|
<div class="mr-auto">
|
||||||
|
<h3 class="m-subheader__title">
|
||||||
|
Job Orders (Open)
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END: Subheader -->
|
||||||
|
<div class="m-content">
|
||||||
|
<!--Begin::Section-->
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xl-12">
|
||||||
|
<div class="m-portlet m-portlet--mobile">
|
||||||
|
<div class="m-portlet__body">
|
||||||
|
<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
|
||||||
|
<div class="row align-items-center">
|
||||||
|
<div class="col-xl-12">
|
||||||
|
<div class="form-group m-form__group row align-items-center">
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="m-input-icon m-input-icon--left">
|
||||||
|
<input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
|
||||||
|
<span class="m-input-icon__icon m-input-icon__icon--left">
|
||||||
|
<span><i class="la la-search"></i></span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="m-input-icon m-input-icon--left">
|
||||||
|
<div>
|
||||||
|
<select class="form-control m-input" id="rider_list" name="rider_list">
|
||||||
|
<option value="">All Riders</option>
|
||||||
|
{% for rider in riders %}
|
||||||
|
<option value="{{ rider.getID }}">{{ rider.getFirstName ~ ' ' ~ rider.getLastName }} </option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="m-input-icon m-input-icon--left">
|
||||||
|
<div class="input-daterange input-group" id="date-range">
|
||||||
|
<input role="presentation" type="text" class="form-control m-input" id="date_start" name="date_start" placeholder="Start date" />
|
||||||
|
<div class="input-group-append">
|
||||||
|
<span class="input-group-text"><i class="la la-ellipsis-h"></i></span>
|
||||||
|
</div>
|
||||||
|
<input role="presentation" type="text" class="form-control" id="date_end" name="date_end" placeholder="End date" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!--begin: Datatable -->
|
||||||
|
<div id="data-rows"></div>
|
||||||
|
<!--end: Datatable -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
<script>
|
||||||
|
$(function() {
|
||||||
|
$("#date-range").datepicker({
|
||||||
|
orientation: "bottom"
|
||||||
|
});
|
||||||
|
var options = {
|
||||||
|
data: {
|
||||||
|
type: 'remote',
|
||||||
|
source: {
|
||||||
|
read: {
|
||||||
|
url: '{{ url('jo_open_rows') }}',
|
||||||
|
method: 'POST'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
saveState: {
|
||||||
|
cookie: false,
|
||||||
|
webstorage: false
|
||||||
|
},
|
||||||
|
pageSize: 10,
|
||||||
|
serverPaging: true,
|
||||||
|
serverFiltering: true,
|
||||||
|
serverSorting: true
|
||||||
|
},
|
||||||
|
rows: {
|
||||||
|
beforeTemplate: function (row, data, index) {
|
||||||
|
if (data.flag_advance) {
|
||||||
|
$(row).addClass('m-table__row--danger');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.is_mobile) {
|
||||||
|
$(row).addClass('m-table__row--is_mobile');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
columns: [
|
||||||
|
{
|
||||||
|
field: 'id',
|
||||||
|
title: 'JO #'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'plate_number',
|
||||||
|
title: 'Plate #'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'customer_name',
|
||||||
|
title: 'Customer'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'delivery_address',
|
||||||
|
title: 'Area'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'type',
|
||||||
|
title: 'Schedule'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'date_schedule',
|
||||||
|
title: 'Scheduled Date'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'status',
|
||||||
|
title: 'Status'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'processor',
|
||||||
|
title: 'Dispatcher'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'Actions',
|
||||||
|
width: 110,
|
||||||
|
title: 'Actions',
|
||||||
|
sortable: false,
|
||||||
|
overflow: 'visible',
|
||||||
|
template: function (row, index, datatable) {
|
||||||
|
{% if is_granted('jo_onestep.edit') %}
|
||||||
|
var actions = '<a href="' + row.meta.onestep_edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-reassign-hub" title="Edit"><i class="fa fa-file"></i></a>';
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
return actions;
|
||||||
|
},
|
||||||
|
}
|
||||||
|
],
|
||||||
|
search: {
|
||||||
|
onEnter: false,
|
||||||
|
input: $('#data-rows-search'),
|
||||||
|
delay: 400
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var table = $("#data-rows").mDatatable(options);
|
||||||
|
|
||||||
|
// auto refresh table
|
||||||
|
setInterval(function() {
|
||||||
|
table.reload();
|
||||||
|
}, {{ table_refresh_rate }});
|
||||||
|
|
||||||
|
$("#rider_list").on("change", function() {
|
||||||
|
table.search($(this).val(), "rider");
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#date_start").on("change", function() {
|
||||||
|
var date_start = $(this).val();
|
||||||
|
var date_end = $("[name='date_end']").val();
|
||||||
|
var date_array = [date_start, date_end];
|
||||||
|
|
||||||
|
table.search(date_array, "schedule_date");
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#date_end").on("change", function() {
|
||||||
|
console.log($(this).val());
|
||||||
|
|
||||||
|
var date_end = $(this).val();
|
||||||
|
var date_start = $("[name='date_start']").val();
|
||||||
|
var date_array = [date_start, date_end];
|
||||||
|
|
||||||
|
table.search(date_array, "schedule_date");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
||||||
143
templates/service-charge/form.html.twig
Normal file
143
templates/service-charge/form.html.twig
Normal file
|
|
@ -0,0 +1,143 @@
|
||||||
|
{% extends 'base.html.twig' %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
<!-- BEGIN: Subheader -->
|
||||||
|
<div class="m-subheader">
|
||||||
|
<div class="d-flex align-items-center">
|
||||||
|
<div class="mr-auto">
|
||||||
|
<h3 class="m-subheader__title">Service Charges</h3>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END: Subheader -->
|
||||||
|
<div class="m-content">
|
||||||
|
<!--Begin::Section-->
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xl-8">
|
||||||
|
<div class="m-portlet m-portlet--mobile">
|
||||||
|
<div class="m-portlet__head">
|
||||||
|
<div class="m-portlet__head-caption">
|
||||||
|
<div class="m-portlet__head-title">
|
||||||
|
<span class="m-portlet__head-icon">
|
||||||
|
<i class="la la-key"></i>
|
||||||
|
</span>
|
||||||
|
<h3 class="m-portlet__head-text">
|
||||||
|
{% if mode == 'update' %}
|
||||||
|
Edit Service Charge
|
||||||
|
<small>{{ obj.getID() }}</small>
|
||||||
|
{% else %}
|
||||||
|
New Service Charge
|
||||||
|
{% endif %}
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('service_charge_update_submit', {'id': obj.getID()}) : url('service_charge_create_submit') }}">
|
||||||
|
<div class="m-portlet__body">
|
||||||
|
<div class="form-group m-form__group row no-border">
|
||||||
|
<div class="col-lg-12">
|
||||||
|
<label data-field="name">
|
||||||
|
Name:
|
||||||
|
</label>
|
||||||
|
<input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
|
||||||
|
<div class="form-control-feedback hide" data-field="name"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group m-form__group row no-border">
|
||||||
|
<div class="col-lg-12">
|
||||||
|
<label data-field="amount">
|
||||||
|
Amount:
|
||||||
|
</label>
|
||||||
|
<input type="number" name="amount" class="form-control m-input" value="{{ obj.getAmount() }}">
|
||||||
|
<div class="form-control-feedback hide" data-field="amount"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="m-portlet__foot m-portlet__foot--fit">
|
||||||
|
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-12">
|
||||||
|
<button type="submit" class="btn btn-success">Submit</button>
|
||||||
|
<a href="{{ url('service_charge_list') }}" class="btn btn-secondary">Back</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
<script>
|
||||||
|
$(function() {
|
||||||
|
$("#row-form").submit(function(e) {
|
||||||
|
var form = $(this);
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
method: "POST",
|
||||||
|
url: form.prop('action'),
|
||||||
|
data: form.serialize()
|
||||||
|
}).done(function(response) {
|
||||||
|
// remove all error classes
|
||||||
|
removeErrors();
|
||||||
|
swal({
|
||||||
|
title: 'Done!',
|
||||||
|
text: 'Your changes have been saved!',
|
||||||
|
type: 'success',
|
||||||
|
onClose: function() {
|
||||||
|
window.location.href = "{{ url('service_charge_list') }}";
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}).fail(function(response) {
|
||||||
|
if (response.status == 422 || response.status == 403) {
|
||||||
|
var errors = response.responseJSON.errors;
|
||||||
|
var firstfield = false;
|
||||||
|
|
||||||
|
// remove all error classes first
|
||||||
|
removeErrors();
|
||||||
|
|
||||||
|
// display errors contextually
|
||||||
|
$.each(errors, function(field, msg) {
|
||||||
|
var formfield = $("[name='" + field + "']");
|
||||||
|
var label = $("label[data-field='" + field + "']");
|
||||||
|
var msgbox = $(".form-control-feedback[data-field='" + field + "']");
|
||||||
|
|
||||||
|
// add error classes to bad fields
|
||||||
|
formfield.addClass('form-control-danger');
|
||||||
|
label.addClass('has-danger');
|
||||||
|
msgbox.html(msg).addClass('has-danger').removeClass('hide');
|
||||||
|
|
||||||
|
// check if this field comes first in DOM
|
||||||
|
var domfield = formfield.get(0);
|
||||||
|
|
||||||
|
if (!firstfield || (firstfield && firstfield.compareDocumentPosition(domfield) === 2)) {
|
||||||
|
firstfield = domfield;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// focus on first bad field
|
||||||
|
firstfield.focus();
|
||||||
|
|
||||||
|
// scroll to above that field to make it visible
|
||||||
|
$('html, body').animate({
|
||||||
|
scrollTop: $(firstfield).offset().top - 200
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// remove all error classes
|
||||||
|
function removeErrors() {
|
||||||
|
$(".form-control-danger").removeClass('form-control-danger');
|
||||||
|
$("[data-field]").removeClass('has-danger');
|
||||||
|
$(".form-control-feedback[data-field]").addClass('hide');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
||||||
142
templates/service-charge/list.html.twig
Normal file
142
templates/service-charge/list.html.twig
Normal file
|
|
@ -0,0 +1,142 @@
|
||||||
|
{% extends 'base.html.twig' %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
<!-- BEGIN: Subheader -->
|
||||||
|
<div class="m-subheader">
|
||||||
|
<div class="d-flex align-items-center">
|
||||||
|
<div class="mr-auto">
|
||||||
|
<h3 class="m-subheader__title">
|
||||||
|
Service Charges
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- END: Subheader -->
|
||||||
|
<div class="m-content">
|
||||||
|
<!--Begin::Section-->
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xl-12">
|
||||||
|
<div class="m-portlet m-portlet--mobile">
|
||||||
|
<div class="m-portlet__body">
|
||||||
|
<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
|
||||||
|
<div class="row align-items-center">
|
||||||
|
<div class="col-xl-8 order-2 order-xl-1">
|
||||||
|
<div class="form-group m-form__group row align-items-center">
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="m-input-icon m-input-icon--left">
|
||||||
|
<input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
|
||||||
|
<span class="m-input-icon__icon m-input-icon__icon--left">
|
||||||
|
<span><i class="la la-search"></i></span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-xl-4 order-1 order-xl-2 m--align-right">
|
||||||
|
<a href="{{ url('service_charge_create') }}" class="btn btn-focus m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill">
|
||||||
|
<span>
|
||||||
|
<i class="la la-key"></i>
|
||||||
|
<span>New Service Charge</span>
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
<div class="m-separator m-separator--dashed d-xl-none"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!--begin: Datatable -->
|
||||||
|
<div id="data-rows"></div>
|
||||||
|
<!--end: Datatable -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
<script>
|
||||||
|
$(function() {
|
||||||
|
var options = {
|
||||||
|
data: {
|
||||||
|
type: 'remote',
|
||||||
|
source: {
|
||||||
|
read: {
|
||||||
|
url: '{{ url("service_charge_rows") }}',
|
||||||
|
method: 'POST'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
saveState: {
|
||||||
|
cookie: false,
|
||||||
|
webstorage: false
|
||||||
|
},
|
||||||
|
pageSize: 10,
|
||||||
|
serverPaging: true,
|
||||||
|
serverFiltering: true,
|
||||||
|
serverSorting: true
|
||||||
|
},
|
||||||
|
columns: [
|
||||||
|
{
|
||||||
|
field: 'id',
|
||||||
|
title: 'ID'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'name',
|
||||||
|
title: 'Name'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'Actions',
|
||||||
|
width: 110,
|
||||||
|
title: 'Actions',
|
||||||
|
sortable: false,
|
||||||
|
overflow: 'visible',
|
||||||
|
template: function (row, index, datatable) {
|
||||||
|
var actions = '';
|
||||||
|
|
||||||
|
if (row.meta.update_url != '') {
|
||||||
|
actions += '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.name + '" title="Edit"><i class="la la-edit"></i></a>';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (row.meta.delete_url != '') {
|
||||||
|
actions += '<a href="' + row.meta.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.id + '" title="Delete"><i class="la la-trash"></i></a>';
|
||||||
|
}
|
||||||
|
|
||||||
|
return actions;
|
||||||
|
},
|
||||||
|
}
|
||||||
|
],
|
||||||
|
search: {
|
||||||
|
onEnter: false,
|
||||||
|
input: $('#data-rows-search'),
|
||||||
|
delay: 400
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var table = $("#data-rows").mDatatable(options);
|
||||||
|
|
||||||
|
$(document).on('click', '.btn-delete', function(e) {
|
||||||
|
var url = $(this).prop('href');
|
||||||
|
var id = $(this).data('id');
|
||||||
|
var btn = $(this);
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
swal({
|
||||||
|
title: 'Confirmation',
|
||||||
|
html: 'Are you sure you want to delete <strong>' + id + '</strong>?',
|
||||||
|
type: 'warning',
|
||||||
|
showCancelButton: true
|
||||||
|
}).then((result) => {
|
||||||
|
if (result.value) {
|
||||||
|
$.ajax({
|
||||||
|
method: "DELETE",
|
||||||
|
url: url
|
||||||
|
}).done(function(response) {
|
||||||
|
table.row(btn.parents('tr')).remove();
|
||||||
|
table.reload();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
||||||
Loading…
Reference in a new issue