sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Driver Settlement - #3232

Browse Source
This commit is contained in:
Daniel Camargo 2014-07-01 18:47:04 -03:00
parent 842b8c0b21
commit 4a72fa7521
13 changed files with 450 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db/migrate/000198_settlement.sql Normal file
View File

@ -0,0 +1,5 @@
ALTER TABLE `payment_schedule` ADD `pay_type` enum('payment','reimbursement') DEFAULT 'payment';
ALTER TABLE `payment` ADD `pay_type` enum('payment','reimbursement') DEFAULT 'payment';
ALTER TABLE `order_transaction` CHANGE `type` `type` enum('debit','credit','paid-to-restaurant','paid-to-driver','reimbursed-driver') DEFAULT NULL;

52
include/controllers/default/cockpit2/api/settlement/index.php
View File

@ -3,29 +3,19 @@
class Controller_Api_Settlement extends Crunchbutton_Controller_RestAccount {
public function init() {
/*
$set = new Settlement;
// $this->_driverBegin();
// exit;
$order = Order::o( 24462 );
$order = Order::o( 24463 );
$order = Order::o( 24464 );
// $set = new Settlement;
$vars = [
$set->orderExtractVariables( Order::o( 24464 ) ),
$set->orderExtractVariables( Order::o( 24463 ) ),
$set->orderExtractVariables( Order::o( 24462 ) ),
];
// echo json_encode( $set->driversProcessOrders( [ $set->orderExtractVariables( Order::o( c::getPagePiece( 2 ) ) ) ] ) );exit();;
// $set->scheduleDriverPayment( [], Crunchbutton_Payment::PAY_TYPE_PAYMENT );
// $set->scheduleDriverPayment( [], Crunchbutton_Payment::PAY_TYPE_REIMBURSEMENT );
echo json_encode( $set->driversProcessOrders( $vars ) );exit;
// exit;
$this->_driverBegin();
exit;
*/
if( !c::admin()->permission()->check( ['global', 'settlement' ] ) ){
$this->_error();
}
@ -114,6 +104,9 @@ echo json_encode( $set->driversProcessOrders( $vars ) );exit;
case 'transfer-driver':
$this->_driverTransferDeliveryDriver();
break;
case 'schedule':
$this->_driverSchedule();
break;
default:
$this->_error();
break;
@ -396,8 +389,10 @@ echo json_encode( $set->driversProcessOrders( $vars ) );exit;
$settlement = new Settlement( [ 'start' => $start, 'end' => $end ] );
$orders = $settlement->startDriver();
$out = [ 'drivers' => [] ];
$out = [ 'notes' => Crunchbutton_Settlement::DEFAULT_NOTES ];
$out = [ 'drivers' => [],
'notes' => Crunchbutton_Settlement::DEFAULT_NOTES,
'payment' => Cockpit_Payment_Schedule::PAY_TYPE_PAYMENT,
'reimbursement' => Cockpit_Payment_Schedule::PAY_TYPE_REIMBURSEMENT ];
foreach ( $orders as $key => $val ) {
if( !$orders[ $key ][ 'name' ] ){
continue;
@ -458,6 +453,25 @@ echo json_encode( $set->driversProcessOrders( $vars ) );exit;
echo json_encode( [ 'success' => true ] );
}
private function _driverSchedule(){
$start = $this->request()['start'];
$end = $this->request()['end'];
$pay_type = $this->request()['pay_type'];
$_id_drivers = explode( ',', $this->request()['id_drivers'] );
$id_drivers = [];
foreach ( $_id_drivers as $key => $val ) {
$id_driver = trim( $val );
$notes = $this->request()[ 'notes_' . $id_driver ];
$adjustment = $this->request()[ 'adjustments_' . $id_driver ];
$id_drivers[ $id_driver ] = [];
$id_drivers[ $id_driver ][ 'notes' ] = ( $notes ) ? $notes : Crunchbutton_Settlement::DEFAULT_NOTES;
$id_drivers[ $id_driver ][ 'adjustment' ] = $adjustment;
}
$settlement = new Settlement( [ 'payment_method' => $pay_type, 'start' => $start, 'end' => $end ] );
$settlement->scheduleDriverPayment( $id_drivers, $pay_type );
echo json_encode( [ 'success' => true ] );
}
private function _range(){
$now = new DateTime( 'now', new DateTimeZone( c::config()->timezone ) );
$range = [ 'end' => $now->format( 'Y,m,d' ) ];

3
include/library/Cockpit/Payment/Schedule.php
View File

@ -5,6 +5,9 @@ class Cockpit_Payment_Schedule extends Cana_Table {
const TYPE_RESTAURANT = 'restaurant';
const TYPE_DRIVER = 'driver';
const PAY_TYPE_PAYMENT = 'payment';
const PAY_TYPE_REIMBURSEMENT = 'reimbursement';
const STATUS_SCHEDULED = 'scheduled';
const STATUS_PROCESSING = 'processing';
const STATUS_DONE = 'done';

24
include/library/Cockpit/Payment/Schedule/Order.php
View File

@ -11,7 +11,29 @@ class Cockpit_Payment_Schedule_Order extends Cana_Table {
public function checkOrderWasPaidRestaurant( $id_order ){
$query = 'SELECT * FROM payment_schedule_order pso
INNER JOIN payment_schedule ps ON ps.id_payment_schedule = pso.id_payment_schedule AND ps.type = "' . Cockpit_Payment_Schedule::TYPE_RESTAURANT . '"
INNER JOIN payment_schedule ps ON ps.id_payment_schedule = pso.id_payment_schedule AND ps.type = "' . Cockpit_Payment_Schedule::TYPE_RESTAURANT . '" AND ps.pay_type = "' . Cockpit_Payment_Schedule::PAY_TYPE_PAYMENT . '"
WHERE pso.id_order = "' . $id_order . '" LIMIT 1';
$order = Cockpit_Payment_Schedule_Order::q( $query );
if( $order->id_payment_schedule_order ){
return true;
}
return false;
}
public function checkOrderWasReimbursedDriver( $id_order ){
$query = 'SELECT * FROM payment_schedule_order pso
INNER JOIN payment_schedule ps ON pso.id_payment_schedule = pso.id_payment_schedule AND ps.type = "' . Cockpit_Payment_Schedule::TYPE_DRIVER . '" AND ps.pay_type = "' . Cockpit_Payment_Schedule::PAY_TYPE_REIMBURSEMENT . '"
WHERE pso.id_order = "' . $id_order . '" LIMIT 1';
$order = Cockpit_Payment_Schedule_Order::q( $query );
if( $order->id_payment_schedule_order ){
return true;
}
return false;
}
public function checkOrderWasPaidDriver( $id_order ){
$query = 'SELECT * FROM payment_schedule_order pso
INNER JOIN payment_schedule ps ON pso.id_payment_schedule = pso.id_payment_schedule AND ps.type = "' . Cockpit_Payment_Schedule::TYPE_DRIVER . '" AND ps.pay_type = "' . Cockpit_Payment_Schedule::PAY_TYPE_PAYMENT . '"
WHERE pso.id_order = "' . $id_order . '" LIMIT 1';
$order = Cockpit_Payment_Schedule_Order::q( $query );
if( $order->id_payment_schedule_order ){

25
include/library/Crunchbutton/Order/Transaction.php
View File

@ -7,6 +7,7 @@ class Crunchbutton_Order_Transaction extends Cana_Table {
const TYPE_PAID_TO_RESTAURANT = 'paid-to-restaurant';
const TYPE_PAID_TO_DRIVER = 'paid-to-driver';
const TYPE_REIMBURSED_TO_DRIVER = 'reimbursed-driver';
const PAYMENT_TYPE_GIFT = 'gift';
const PAYMENT_TYPE_CARD = 'card';
@ -14,9 +15,27 @@ class Crunchbutton_Order_Transaction extends Cana_Table {
const SOURCE_RESTAURANT = 'restaurant';
public function checkOrderWasPaidRestaurant( $id_order ){
$query = 'SELECT * FROM order_transaction ot WHERE type = "' . Crunchbutton_Order_Transaction::TYPE_PAID_TO_RESTAURANT . '" LIMIT 1';
$order = Cockpit_Payment_Schedule_Order::q( $query );
if( $order->id_payment_schedule_order ){
$query = 'SELECT * FROM order_transaction ot WHERE type = "' . Crunchbutton_Order_Transaction::TYPE_PAID_TO_RESTAURANT . '" AND id_order = "' . $id_order . '" LIMIT 1';
$order = Crunchbutton_Order_Transaction::q( $query );
if( $order->id_order_transaction ){
return true;
}
return false;
}
public function checkOrderWasReimbursedDriver( $id_order ){
$query = 'SELECT * FROM order_transaction ot WHERE type = "' . Crunchbutton_Order_Transaction::TYPE_REIMBURSED_TO_DRIVER . '" AND id_order = "' . $id_order . '" LIMIT 1';
$order = Crunchbutton_Order_Transaction::q( $query );
if( $order->id_order_transaction ){
return true;
}
return false;
}
public function checkOrderWasPaidDriver( $id_order ){
$query = 'SELECT * FROM order_transaction ot WHERE type = "' . Crunchbutton_Order_Transaction::TYPE_PAID_TO_DRIVER . '" AND id_order = "' . $id_order . '" LIMIT 1';
$order = Crunchbutton_Order_Transaction::q( $query );
if( $order->id_order_transaction ){
return true;
}
return false;

4
include/library/Crunchbutton/Payment.php
View File

@ -1,6 +1,10 @@
<?php
class Crunchbutton_Payment extends Cana_Table {
const PAY_TYPE_PAYMENT = 'payment';
const PAY_TYPE_REIMBURSEMENT = 'reimbursement';
public static function credit($params = null) {
$payment = new Payment((object)$params);

125
include/library/Crunchbutton/Settlement.php
View File

@ -52,7 +52,6 @@ class Crunchbutton_Settlement extends Cana_Model {
// todo: do not commit with this line
// $query = 'SELECT * FROM `order` WHERE id_order IN( 24462, 24463, 24464 ) order by id_order desc';
// $query = 'SELECT * FROM `order` WHERE id_order IN( 24515,24505,24497,24420,24407,24484,24495,24457,24438,24429,24493,24460,24450,24427,24418,24455,24406,24409,24513,24476,24435,24501,24494,24456,24421,24423,24403,24408,24424,24449,24504,24436,24434,24417,24516,24485,24488,24437,24451,24512,24507,24500,24466,24422,24496,24432,24425,24487,24498,24433,24405,24411,24483,24474,24473,24472,24419,24415,24471,24443,24416,24503,24499,24492,24490,24448,24446,24414,24413,24491,24447,24412,24509,24506,24479,24478,24462,24461,24428,24508,24475,24463,24440,24489,24486,24514,24464,24431,24458,24430,24511,24404,24470,24482,24459,24467,24502,24480,24426 ) order by id_order desc';
// $query = 'SELECT * FROM `order` WHERE id_order IN( 13809,13808,13806,13803,13802,13800,13794,13793,13791,13789,13784,13782,13781,13780,13778,13774,13772,13771,13770,13768,13762,13761,13748,13747,13731,13728,13727,13726,13708,13707,13705,13704,13703,13699,13698,13690,13689,13688,13687,13685,13684,13683,13681,13679,13678,13675,13673,13672,13671,13667,13662,13660,13658,13657,13656,13653,13652,13651,13637,13632,13619,13618,13617,13613,13612,13611,13608,13607,13606,13604,13603,13601,13599,13598,13596,13594,13592,13588,13585,13584,13583,13582,13581,13579,13578,13577,13576,13572,13569,13562,13557,13548,13546,13538,13534,13532,13530,13527,13522,13521,13519,13517,13515,13511,13510,13508,13504,13493,13491,13483,13477,13468,13467,13465,13464,13463,13462,13461,13459,13457,13456,13455,13454,13443,13442,13440,13439,13438,13436,13435,13424,13419,13407,13404,13396,13395,13385,13384,13383,13381,13380,13377,13374,13370,13369,13367,13360,13357,13356,13355,13353,13345,13344,13328,13325,13324,13323,13322,13321,13320,13316,13315,13314,13311,13306,13304,13301,13299,13296,13293,13278,13262,13717,13674,13641,13610,13609,13597,13529,13526,13525,13466,13362,13655,13744,13494,13414,13409,13408,13399,13388,13359,13350,13297,13289,13732,13670,13458,13452,13718,13600,13595,13512,13444,13441,13400,13317,13308,13280,13276,13779,13752,13722,13713,13697,13605,13482,13413,13264,13661,13633,13496,13365,13757,13733,13724,13723,13715,13627,13621,13574,13567,13566,13555,13553,13543,13535,13503,13498,13427,13393,13624,13623,13550,13263,13734,13725,13415,13351,13268,13736,13634,13475,13417,13544,13397,13285,13284,13735,13341,13799,13785,13766,13730,13702,13696,13692,13686,13682,13677,13665,13590,13589,13568,13565,13536,13518,13516,13513,13433,13411,13405,13368,13319,13291,13265,13797,13788,13783,13769,13746,13745,13738,13729,13720,13719,13711,13691,13676,13669,13663,13650,13645,13644,13642,13636,13626,13602,13586,13552,13545,13542,13540,13514,13500,13499,13481,13476,13449,13448,13447,13445,13437,13434,13432,13430,13428,13426,13423,13416,13392,13387,13376,13373,13366,13364,13361,13336,13335,13318,13313,13312,13303,13302,13290,13269,13710,13292,13750,13286,13382,13267,13739,13716,13469,13271,13334,13547,13497,13480,13394,13391,13277,13807,13764,13554,13531,13528,13472,13406,13330,13307,13638,13635,13741,13495,13283,13714,13375,13629,13622,13420,13616,13506,13777,13759,13668,13580,13573,13502,13484,13473,13421,13352,13343,13282,13709,13706,13620,13470,13332,13509,13649,13765,13763,13666,13628,13570,13563,13541,13489,13487,13471,13425,13422,13418,13333,13273,13614,13533,13524,13460,13776,13694,13680,13615,13520,13453,13331,13281,13275,13558,13485,13310,13551,13753,13295,13266,13279,13805,13804,13801,13796,13756,13754,13751,13701,13700,13695,13693,13664,13654,13593,13587,13575,13571,13564,13556,13523,13507,13505,13501,13492,13450,13446,13431,13429,13372,13363,13358,13309,13305,13379,13272,13591,13486,13340,13537,13560,13410,13354,13755,13749,13740,13647,13561,13559,13288,13287,13625,13398,13339,13338,13294,13742,13640,13630,13349,13347,13346,13737,13643,13639,13490,13479,13478,13386,13270,13760,13659,13648 ) order by id_order desc';
return Order::q( $query );
}
@ -141,10 +140,6 @@ class Crunchbutton_Settlement extends Cana_Model {
$pay[ $driver ][ 'name' ] = $order[ 'driver' ];
}
if( $order[ 'do_not_pay_driver' ] == 1 ){
continue;
}
$order[ 'pay_info' ] = [];
$order[ 'pay_info' ][ 'subtotal' ] = $this->orderSubtotalDriveryPay( $order );
$order[ 'pay_info' ][ 'tax' ] = $this->orderTaxDriverPay( $order );
@ -158,8 +153,19 @@ class Crunchbutton_Settlement extends Cana_Model {
$order[ 'pay_info' ][ 'total_reimburse' ] = $this->orderReimburseDriver( $order );
$order[ 'pay_info' ][ 'total_payment' ] = $this->orderCalculateTotalDueDriver( $order[ 'pay_info' ] );
if( $order[ 'driver_reimbursed' ] ){
$order[ 'pay_info' ][ 'total_reimburse' ] = 0;
}
if( $order[ 'driver_paid' ] ){
$order[ 'pay_info' ][ 'total_payment' ] = 0;
}
$pay[ $driver ][ 'orders' ][] = $order;
// echo json_encode( $order_info );exit;
if( $order[ 'do_not_pay_driver' ] == 1 ){
continue;
}
$pay[ $driver ][ 'subtotal' ] += $order[ 'pay_info' ][ 'subtotal' ];
$pay[ $driver ][ 'tax' ] += $order[ 'pay_info' ][ 'tax' ];
$pay[ $driver ][ 'delivery_fee' ] += $order[ 'pay_info' ][ 'delivery_fee' ];
@ -170,14 +176,10 @@ class Crunchbutton_Settlement extends Cana_Model {
$pay[ $driver ][ 'restaurant_fee' ] += $order[ 'pay_info' ][ 'restaurant_fee' ];
$pay[ $driver ][ 'gift_card' ] += $order[ 'pay_info' ][ 'gift_card' ];
$pay[ $driver ][ 'total_reimburse' ] += $order[ 'pay_info' ][ 'total_reimburse' ];
$pay[ $driver ][ 'total_payment' ] += $order[ 'pay_info' ][ 'total_payment' ];
}
}
foreach( $pay as $key => $val ){
$pay[ $key ][ 'total_payment' ] = $this->orderCalculateTotalDueDriver( $pay[ $key ] );
}
usort( $pay, function( $a, $b ) {
return $a[ 'name'] > $b[ 'name' ];
});
@ -313,7 +315,7 @@ class Crunchbutton_Settlement extends Cana_Model {
// https://github.com/crunchbutton/crunchbutton/issues/3232#issuecomment-47254475
// https://github.com/crunchbutton/crunchbutton/issues/3232#issuecomment-47283481
public function orderReimburseDriver( $arr ){
return ( $arr[ 'subtotal' ] + $arr[ 'tax' ] ) * $arr[ 'credit' ] * $arr[ 'delivery_service' ];
return ( $arr[ 'subtotal' ] + $arr[ 'tax' ] ) * $arr[ 'credit' ] * $arr[ 'delivery_service' ] * ( 1 - $arr[ 'formal_relationship' ] );
}
// Drivers are paid the whole tip from credit orders.
@ -412,14 +414,24 @@ class Crunchbutton_Settlement extends Cana_Model {
$values[ 'pay_if_refunded' ] = ( $order->pay_if_refunded > 0 ) ? 1: 0;
$values[ 'reimburse_cash_order' ] = ( $order->reimburse_cash_order > 0 ) ? 1: 0;
// convert all to float -> mysql returns some values as string
foreach( $values as $key => $val ){
$values[ $key ] = floatval( $val );
}
$values[ 'restaurant_paid' ] = Cockpit_Payment_Schedule_Order::checkOrderWasPaidRestaurant( $order->id_order );
if( !$values[ 'restaurant_paid' ] ){
$values[ 'restaurant_paid' ] = Crunchbutton_Order_Transaction::checkOrderWasPaidRestaurant( $order->id_order );
}
// convert all to float -> mysql returns some values as string
foreach( $values as $key => $val ){
$values[ $key ] = floatval( $val );
$values[ 'driver_reimbursed' ] = Cockpit_Payment_Schedule_Order::checkOrderWasReimbursedDriver( $order->id_order );
if( !$values[ 'driver_reimbursed' ] ){
$values[ 'driver_reimbursed' ] = Crunchbutton_Order_Transaction::checkOrderWasReimbursedDriver( $order->id_order );
}
$values[ 'driver_paid' ] = Cockpit_Payment_Schedule_Order::checkOrderWasPaidDriver( $order->id_order );
if( !$values[ 'driver_paid' ] ){
$values[ 'driver_paid' ] = Crunchbutton_Order_Transaction::checkOrderWasPaidDriver( $order->id_order );
}
if( $values[ 'id_admin' ] ){
@ -442,7 +454,6 @@ class Crunchbutton_Settlement extends Cana_Model {
$this->log( 'scheduleRestaurantPayment', $id_restaurants );
$restaurants = $this->startRestaurant();
foreach ( $restaurants as $_restaurant ) {
// todo: build a better way to filter - this way is very ugly
if( !$id_restaurants[ $_restaurant->id_restaurant ] ){
continue;
}
@ -472,6 +483,7 @@ class Crunchbutton_Settlement extends Cana_Model {
$schedule->date = date( 'Y-m-d H:i:s' );
$schedule->amount = max( $payment_data[ 'total_due' ], 0 );
$schedule->adjustment = $adjustment;
$schedule->pay_type = Cockpit_Payment_Schedule::PAYMENT_TYPE_PAYMENT;
$schedule->type = Cockpit_Payment_Schedule::TYPE_RESTAURANT;
$schedule->status = Cockpit_Payment_Schedule::STATUS_SCHEDULED;
$schedule->note = $notes;
@ -491,8 +503,87 @@ class Crunchbutton_Settlement extends Cana_Model {
}
}
$settlement = new Crunchbutton_Settlement;
// Cana::timeout(function() use( $settlement ) {
Cana::timeout(function() use( $settlement ) {
$settlement->doRestaurantPayments();
} );
}
public function scheduleDriverPayment( $id_drivers, $type ){
$this->log( 'scheduleDriversPayment', $id_drivers );
$drivers = $this->startDriver();
foreach ( $drivers as $_driver ) {
if( !$id_drivers[ $_driver[ 'id_admin' ] ] ){
continue;
}
$notes = $id_drivers[ $_driver[ 'id_admin' ] ][ 'notes' ];
$adjustment = $id_drivers[ $_driver[ 'id_admin' ] ][ 'adjustment' ];
$id_driver = $_driver[ 'id_admin' ];
$shouldSchedule = false;
if( $type == Cockpit_Payment_Schedule::PAY_TYPE_REIMBURSEMENT ){
$shouldSchedule = ( $_driver[ 'total_reimburse' ] != 0 ) ? true : false;
} else {
$shouldSchedule = ( $_driver[ 'total_payment' ] != 0 ) ? true : false;
}
foreach ( $_driver[ 'orders' ] as $order ) {
if( $type == Cockpit_Payment_Schedule::PAY_TYPE_REIMBURSEMENT ){
if( !$order[ 'driver_reimbursed' ] ){
$shouldSchedule = true;
}
} else {
if( !$order[ 'driver_paid' ] ){
$shouldSchedule = true;
}
}
}
if( $shouldSchedule ){
// schedule it
$schedule = new Cockpit_Payment_Schedule;
$schedule->id_driver = $id_driver;
$schedule->date = date( 'Y-m-d H:i:s' );
if( $type == Cockpit_Payment_Schedule::PAY_TYPE_REIMBURSEMENT ){
$amount = $_driver[ 'total_reimburse' ];
} else {
$amount = $_driver[ 'total_payment' ] + $adjustment;
}
$schedule->amount = max( $amount, 0 );
$schedule->adjustment = $adjustment;
$schedule->pay_type = $type;
$schedule->type = Cockpit_Payment_Schedule::TYPE_DRIVER;
$schedule->status = Cockpit_Payment_Schedule::STATUS_SCHEDULED;
$schedule->note = $notes;
$schedule->id_admin = c::user()->id_admin;
$schedule->save();
$id_payment_schedule = $schedule->id_payment_schedule;
foreach ( $_driver[ 'orders' ] as $order ) {
if( $type == Cockpit_Payment_Schedule::PAY_TYPE_REIMBURSEMENT ){
$order_amount = $order[ 'pay_info' ][ 'total_reimburse' ];
} else {
$order_amount = $order[ 'pay_info' ][ 'total_payment' ];
}
$schedule_order = new Cockpit_Payment_Schedule_Order;
$schedule_order->id_payment_schedule = $id_payment_schedule;
$schedule_order->id_order = $order[ 'id_order' ];
$schedule_order->amount = $order_amount;
$schedule_order->save();
}
$this->log( 'scheduleDriverPayment', $schedule->properties() );
}
}
// $settlement = new Crunchbutton_Settlement;
// Cana::timeout(function() use( $settlement ) {
// $settlement->dodriverPayments();
// } );
}

322
include/views/default/cockpit2/frontend/settlement-drivers.phtml
View File

@ -82,6 +82,10 @@
<td>Total of Not Included Orders</td>
<td>{{total_not_included}}</td>
</tr>
<tr positive-or-negative-color="{{total_payments}}">
<td>Total Reimbursements</td>
<td>$ {{total_reimbursements | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{total_payments}}">
<td>Total Payments</td>
<td>$ {{total_payments | formatPrice}}</td>
@ -94,17 +98,22 @@
<table class="tb-grid tb-zebra">
<thead>
<tr>
<td></td>
<td>#</td>
<td class="td-medium">Drivers</td>
<td class="td-medium">Total Due</td>
<td class="td-medium">Reimbursement</td>
<td class="td-medium">Payment</td>
<td></td>
</tr>
</thead>
<tbody>
<tr ng-repeat="driver in result.drivers" ng-class="{ 'excluded': !driver.pay }">
<td>
<span class="link" ng-click="show_details(driver)"><i class="fa fa-pencil-square-o"></i></span></td>
<td>{{driver.id_admin}}</td>
<td>{{driver.name}}</td>
{{total_due}}
<td>$ {{driver.total_due | formatPrice}}</td>
<td><span class="link details orange" ng-click="show_details(driver.id_admin)">Details</span></td>
<td>$ {{driver.total_reimburse | formatPrice}}</td>
<td>$ {{driver.total_payment | formatPrice}}</td>
</tr>
</tbody>
</table>
@ -156,165 +165,186 @@
<td>Adjustments</td>
<td>$ {{sum.adjustment | formatPrice}}</td>
</tr>
<tr class="total-due" positive-or-negative-color="{{sum.total_due}}">
<td class="td-medium">Total due</td>
<td class="td-medium">$ {{sum.total_due | formatPrice}}</td>
<tr class="total-due" positive-or-negative-color="{{sum.total_reimburse}}">
<td class="td-medium">Total reimbursements</td>
<td class="td-medium">$ {{sum.total_reimburse | formatPrice}}</td>
</tr>
<tr class="total-due" positive-or-negative-color="{{sum.total_payment}}">
<td class="td-medium">Total payments</td>
<td class="td-medium">$ {{sum.total_payment | formatPrice}}</td>
</tr>
</table>
<ul class="ul-inputs box-content">
<li class="li-input">
<button class="button button-big save" ng-click="schedule();">Pay Drivers</button>
<button class="button button-big save" ng-click="schedule_payment();">Pay Drivers</button>
<button class="button button-big orange" ng-click="schedule_reimbursement();">Reimburse Drivers</button>
</li>
</ul>
<br/><br/>
<h2 class="title" ng-show="result.restaurants">
<span>Drivers Details</span>
</h2>
<div ng-show="showing_details">
<div class="box-content" ng-repeat="driver in result.drivers">
<h2 id="driver-{{driver.id_admin}}" class="title" ng-class="{ 'excluded': !driver.pay }">
<span>{{driver.name}}</span></strong>
<h2 class="title" ng-show="result.drivers">
<span>Drivers Details</span>
</h2>
<div class="divider"></div>
<div ng-repeat="driver in result.drivers">
<div>
<div ng-show="driver.show_details" class="box-content">
<h3 class="title" ng-if="driver.last_payment">
Last payment #{{driver.last_payment.id_payment}}: <strong positive-or-negative-color="{{driver.last_payment.amount}}">$ {{driver.last_payment.amount | formatPrice}}</strong> on <strong>{{driver.last_payment.date}}</strong>
</h3>
<table class="tb-grid tb-zebra">
<tbody>
<tr>
<td>
<span ng-click="driver.pay = !driver.pay;summary();">
<span ng-show="driver.pay">
<i class="fa fa-check-square-o"></i> <span class="link"><strong>Include this driver at the payment? </strong></span>
</span>
<span ng-show="!driver.pay">
<i class="fa fa-square-o"></i> <span class="link"><strong>Include this driver at the payment? </strong></span>
</span>
</span>
</td>
<td></td>
</tr>
</tbody>
<tbody ng-show="driver.pay">
<tr>
<td colspan="2">
<ul class="ul-inputs">
<li class="li-input">
<div class="label">Payment notes:</div>
<div class="input"><input type="text" ng-model="driver.notes" maxlength="255" placeholder=""></div>
</li>
</ul>
</td>
</tr>
<tr>
<td colspan="2">
<ul class="ul-inputs">
<li class="li-input">
<div class="label">Adjustments:</div>
<div class="input"><input type="number" ng-model="driver.adjustment" ng-change="summary();" placeholder=""></div>
</li>
</ul>
</td>
</tr>
<tr positive-or-negative-color="{{driver.subtotal}}">
<td>Subtotal</td>
<td>$ {{driver.subtotal | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.tax}}">
<td>Tax</td>
<td>$ {{driver.tax | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.delivery_fee}}">
<td>Delivery Fee</td>
<td>$ {{driver.delivery_fee | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.tip}}">
<td>Tip</td>
<td>$ {{driver.tip | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.customer_fee}}">
<td>Customer Fee</td>
<td>$ {{driver.customer_fee | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.markup}}">
<td>Markup</td>
<td>$ {{driver.markup | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.credit_charge}}">
<td>Credit Card Charge</td>
<td>$ {{driver.credit_charge | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.restaurant_fee}}">
<td>Crunchbutton Fees</td>
<td>$ {{driver.restaurant_fee | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.gift_card}}">
<td>Gift Card</td>
<td>$ {{driver.gift_card | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.adjustment}}">
<td>Adjustments</td>
<td>$ {{driver.adjustment | formatPrice}}</td>
</tr>
<tr class="total-due" positive-or-negative-color="{{driver.total_due}}">
<td class="td-medium">Total due</td>
<td class="td-medium">$ {{driver.total_due | formatPrice}}</td>
</tr>
</tbody>
</table>
<h2 id="driver-{{driver.id_admin}}" class="title" ng-class="{ 'excluded': !driver.pay }">
<span>{{driver.name}}</span></strong>
</h2>
<h3 class="title">
<span class="link" ng-if="!driver.show_orders" ng-click="driver.show_orders = true">Show orders</span>
<span class="link" ng-if="driver.show_orders" ng-click="driver.show_orders = false">Hide orders</span> (total {{driver.orders_count}} orders <span class="orange" ng-if="driver.not_included > 0"><strong> + {{driver.not_included}} </strong> not included order(s)</span> )
</h3>
<div class="divider"></div>
<div>
<h3 class="title" ng-if="driver.last_payment">
Last payment #{{driver.last_payment.id_payment}}: <strong positive-or-negative-color="{{driver.last_payment.amount}}">$ {{driver.last_payment.amount | formatPrice}}</strong> on <strong>{{driver.last_payment.date}}</strong>
</h3>
<table class="tb-grid tb-zebra">
<tbody>
<tr>
<td>
<span ng-click="driver.pay = !driver.pay;summary();">
<span ng-show="driver.pay">
<i class="fa fa-check-square-o"></i> <span class="link"><strong>Include this driver at the payment? </strong></span>
</span>
<span ng-show="!driver.pay">
<i class="fa fa-square-o"></i> <span class="link"><strong>Include this driver at the payment? </strong></span>
</span>
</span>
</td>
<td></td>
</tr>
</tbody>
<tbody ng-show="driver.pay">
<tr>
<td colspan="2">
<ul class="ul-inputs">
<li class="li-input">
<div class="label">Payment notes:</div>
<div class="input"><input type="text" ng-model="driver.notes" maxlength="255" placeholder=""></div>
</li>
</ul>
</td>
</tr>
<tr>
<td colspan="2">
<ul class="ul-inputs">
<li class="li-input">
<div class="label">Adjustments:</div>
<div class="input"><input type="number" ng-model="driver.adjustment" ng-change="summary();" placeholder=""></div>
</li>
</ul>
</td>
</tr>
<tr positive-or-negative-color="{{driver.subtotal}}">
<td>Subtotal</td>
<td>$ {{driver.subtotal | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.tax}}">
<td>Tax</td>
<td>$ {{driver.tax | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.delivery_fee}}">
<td>Delivery Fee</td>
<td>$ {{driver.delivery_fee | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.tip}}">
<td>Tip</td>
<td>$ {{driver.tip | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.customer_fee}}">
<td>Customer Fee</td>
<td>$ {{driver.customer_fee | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.markup}}">
<td>Markup</td>
<td>$ {{driver.markup | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.credit_charge}}">
<td>Credit Card Charge</td>
<td>$ {{driver.credit_charge | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.restaurant_fee}}">
<td>Crunchbutton Fees</td>
<td>$ {{driver.restaurant_fee | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.gift_card}}">
<td>Gift Card</td>
<td>$ {{driver.gift_card | formatPrice}}</td>
</tr>
<tr positive-or-negative-color="{{driver.adjustment}}">
<td>Adjustments</td>
<td>$ {{driver.adjustment | formatPrice}}</td>
</tr>
<tr class="total-due" positive-or-negative-color="{{driver.total_reimburse}}">
<td class="td-medium">Reimbursement</td>
<td class="td-medium">$ {{driver.total_reimburse | formatPrice}}</td>
</tr>
<tr class="total-due" positive-or-negative-color="{{driver.total_payment}}">
<td class="td-medium">Payment</td>
<td class="td-medium">$ {{driver.total_payment | formatPrice}}</td>
</tr>
</tbody>
</table>
<h3 class="title">
<span class="link" ng-if="!driver.show_orders" ng-click="driver.show_orders = true">Show orders</span>
<span class="link" ng-if="driver.show_orders" ng-click="driver.show_orders = false">Hide orders</span> (total {{driver.orders_count}} orders <span class="orange" ng-if="driver.not_included > 0"><strong> + {{driver.not_included}} </strong> not included order(s)</span> )
</h3>
<table class="tb-grid tb-zebra" ng-if="driver.show_orders">
<thead>
<tr>
<td></td>
<td>#</td>
<td class="td-medium">Restaurant</td>
<td class="td-medium">Name</td>
<td>Amount</td>
<td>Reimburse</td>
<td>Payment</td>
<td>Type</td>
<td class="td-medium">Date</td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</thead>
<tbody>
<tr ng-repeat="order in driver.orders">
<td></td>
<td ng-class="{ 'excluded': !order.included }">{{order.id_order}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.restaurant}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.name}}</td>
<td ng-class="{ 'excluded': !order.included }">$ {{order.total | formatPrice}}</td>
<td ng-class="{ 'excluded': !order.included }">$ {{order.total_reimburse | formatPrice}}</td>
<td ng-class="{ 'excluded': !order.included }">$ {{order.total_payment | formatPrice}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.pay_type}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.date}}</td>
<td>
<span class="pointer orange" ng-click="do_not_pay_driver( order.id_order, driver.id_admin, 1 )" ng-if="order.included">
<i class="fa fa-square-o"></i> Do not pay for it.
</span>
<span class="pointer" ng-click="do_not_pay_driver( order.id_order, driver.id_admin, 0 )" ng-if="!order.included">
<i class="fa fa-check-square-o"></i> Will not be paid!
</span>
</td>
<td>
<span title="Transfer this order to another driver" class="link" ng-click="transfer_driver_modal( order.id_order, driver.id_admin );"><i class="fa fa-retweet"></i></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<table class="tb-grid tb-zebra" ng-if="driver.show_orders">
<thead>
<tr>
<td></td>
<td>#</td>
<td class="td-medium">Restaurant</td>
<td class="td-medium">Name</td>
<td>Amount</td>
<td>Payment</td>
<td class="td-medium">Date</td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</thead>
<tbody>
<tr ng-repeat="order in driver.orders">
<td></td>
<td ng-class="{ 'excluded': !order.included }">{{order.id_order}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.restaurant}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.name}}</td>
<td ng-class="{ 'excluded': !order.included }">$ {{order.total | formatPrice}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.pay_type}}</td>
<td ng-class="{ 'excluded': !order.included }">{{order.date}}</td>
<td>
<span class="pointer orange" ng-click="do_not_pay_driver( order.id_order, driver.id_admin, 1 )" ng-if="order.included">
<i class="fa fa-square-o"></i> Do not pay for it.
</span>
<span class="pointer" ng-click="do_not_pay_driver( order.id_order, driver.id_admin, 0 )" ng-if="!order.included">
<i class="fa fa-check-square-o"></i> Will not be paid!
</span>
</td>
<td>
<span title="Transfer this order to another driver" class="link" ng-click="transfer_driver_modal( order.id_order, driver.id_admin );"><i class="fa fa-retweet"></i></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>

2
include/views/default/cockpit2/frontend/settlement-restaurants.phtml
View File

@ -357,7 +357,7 @@
<td>#</td>
<td class="td-medium">Name</td>
<td>Amount</td>
<td>Payment</td>
<td>Type</td>
<td class="td-medium">Date</td>
<td></td>
<td></td>

5
www/assets/cockpit/js/cockpit.js
View File

@ -135,6 +135,11 @@ NGApp.config(['$routeProvider', '$locationProvider', function($routeProvider, $l
controller: 'SettlementDriversCtrl',
templateUrl: 'assets/view/settlement-drivers.html'
})
.when('/settlement/drivers/scheduled', {
action: 'settlement',
controller: 'SettlementDriversScheduledCtrl',
templateUrl: 'assets/view/settlement-drivers-scheduled.html'
})
.when('/drivers/orders', {
action: 'drivers-orders',
controller: 'DriversOrdersCtrl',

63
www/assets/cockpit/js/controllers.settlement.js
View File

@ -201,7 +201,6 @@ NGApp.controller('SettlementRestaurantsCtrl', function ( $scope, $filter, Settle
}
$scope.show_details = function( restaurant ){
if( !restaurant.show_details ){
$scope.showing_details = true;
restaurant.show_details = true;
@ -408,7 +407,7 @@ NGApp.controller('SettlementDriversCtrl', function ( $scope, $filter, Settlement
if( json.start && json.end ){
$scope.range = { 'start' : new Date( json.start ), 'end' : new Date( json.end ) };
$scope.ready = true;
// setTimeout( function() { $scope.begin() }, 100 );
setTimeout( function() { $scope.begin() }, 100 );
}
} );
}
@ -464,20 +463,22 @@ NGApp.controller('SettlementDriversCtrl', function ( $scope, $filter, Settlement
$scope.summary = function(){
var sum = { 'subtotal': 0, 'tax': 0, 'delivery_fee': 0, 'tip': 0, 'customer_fee': 0, 'markup': 0, 'credit_charge': 0, 'gift_card': 0, 'restaurant_fee': 0, 'total_due': 0, 'adjustment' : 0 };
var sum = { 'subtotal': 0, 'tax': 0, 'delivery_fee': 0, 'tip': 0, 'customer_fee': 0, 'markup': 0, 'credit_charge': 0, 'gift_card': 0, 'restaurant_fee': 0, 'total_payment': 0, 'total_reimburse':0, 'adjustment' : 0 };
var total_drivers = 0;
var total_payments = 0;
var total_reimbursements = 0;
var total_orders = 0;
var total_not_included = 0;
var total_adjustments = 0;
var total_refunded = 0;
for( x in $scope.result.drivers ){
$scope.result.drivers[ x ].total_due = ( $scope.result.drivers[ x ].total_due_without_adjustment + $scope.result.drivers[ x ].adjustment );
$scope.result.drivers[ x ].total_payments = ( $scope.result.drivers[ x ].total_payment_without_adjustment + $scope.result.drivers[ x ].adjustment );
if( $scope.result.drivers[ x ].pay ){
total_drivers++;
// include the adjustment at total_due
total_payments += $scope.result.drivers[ x ].total_due;
total_payments += $scope.result.drivers[ x ].total_payments;
total_reimbursements += $scope.result.drivers[ x ].total_reimburse;
total_orders += $scope.result.drivers[ x ].orders_count;
total_not_included += $scope.result.drivers[ x ].not_included;
@ -492,6 +493,7 @@ NGApp.controller('SettlementDriversCtrl', function ( $scope, $filter, Settlement
}
$scope.total_drivers = total_drivers;
$scope.total_payments = total_payments;
$scope.total_reimbursements = total_reimbursements;
$scope.total_orders = total_orders;
$scope.total_not_included = total_not_included;
$scope.total_refunded = total_refunded;
@ -535,8 +537,55 @@ NGApp.controller('SettlementDriversCtrl', function ( $scope, $filter, Settlement
}
}
$scope.show_details = function( id_driver ){
$scope.walkTo( '#driver-' + id_driver, -80 );
$scope.schedule_reimbursement = function(){
schedule( $scope.result.reimbursement );
}
$scope.schedule_payment = function(){
schedule( $scope.result.payment );
}
var schedule = function( pay_type ){
$scope.makeBusy();
var params = { 'start': $filter( 'date' )( $scope.range.start, 'yyyy-MM-dd' ),
'end': $filter( 'date' )( $scope.range.end, 'yyyy-MM-dd' ),
'pay_type': pay_type }
var id_drivers = new Array();
for( x in $scope.result.drivers ){
if( $scope.result.drivers[ x ].pay ){
id_drivers.push( $scope.result.drivers[ x ].id_admin );
params[ 'notes_' + $scope.result.drivers[ x ].id_admin ] = $scope.result.drivers[ x ].notes;
params[ 'adjustments_' + $scope.result.drivers[ x ].id_admin ] = $scope.result.drivers[ x ].adjustment;
}
}
id_drivers = id_drivers.join( ',' );
params[ 'id_drivers' ] = id_drivers;
SettlementService.drivers.schedule( params, function( json ){
$scope.unBusy();
$scope.navigation.link( '/settlement/drivers/scheduled' );
} );
}
$scope.show_details = function( driver ){
if( !driver.show_details ){
$scope.showing_details = true;
driver.show_details = true;
setTimeout( function(){
$scope.walkTo( '#driver-' + driver.id_admin, -80 );
} );
} else {
driver.show_details = false;
$scope.showing_details = false;
for( x in $scope.result.drivers ){
if( $scope.result.drivers[ x ].show_details ){
$scope.showing_details = true;
}
}
}
}
// Just run if the user is loggedin

14
www/assets/cockpit/js/service.driverorders.js
View File

@ -1,5 +1,5 @@
NGApp.factory( 'DriverOrdersService', function( $rootScope, $resource, $routeParams ) {
var service = {};
// Create a private resource 'orders'
@ -11,21 +11,21 @@ NGApp.factory( 'DriverOrdersService', function( $rootScope, $resource, $routePar
'reject' : { 'method': 'POST', params : { 'action' : 'delivery-reject' } },
'pickedup' : { 'method': 'POST', params : { 'action' : 'delivery-pickedup' } },
'delivered' : { 'method': 'POST', params : { 'action' : 'delivery-delivered' } }
}
}
);
service.list = function( callback ){
orders.query( {}, function( data ){
orders.query( {}, function( data ){
var orders = [];
for( var x in data ){
var order = data[ x ];
if( order && order.date && order.date.date ){
order._date = new Date( order.date.date );
order._date = new Date( order.date.date );
orders.push( order );
}
}
service.newOrdersBadge();
callback( orders );
callback( orders );
} );
}
@ -51,9 +51,9 @@ NGApp.factory( 'DriverOrdersService', function( $rootScope, $resource, $routePar
service.get = function( callback ){
var id_order = $routeParams.id;
orders.get( { 'id_order': id_order }, function( order ){
orders.get( { 'id_order': id_order }, function( order ){
order._date = new Date( order.date );
callback( order );
callback( order );
} );
}

7
www/assets/cockpit/js/service.settlement.js
View File

@ -26,6 +26,7 @@ NGApp.factory( 'SettlementService', function( $resource, $http, $routeParams ) {
'range' : { 'method': 'GET', params : { action: 'range' } },
'do_not_pay_driver' : { 'method': 'POST', params : { action: 'do-not-pay-driver' } },
'transfer_driver' : { 'method': 'POST', params : { action: 'transfer-driver' } },
'schedule' : { 'method': 'POST', params : { action: 'schedule' } },
'begin' : { 'method': 'POST', params : { action: 'begin' } }
} );
@ -136,6 +137,12 @@ NGApp.factory( 'SettlementService', function( $resource, $http, $routeParams ) {
} );
}
service.drivers.schedule = function( params, callback ){
settlement.drivers.schedule( params, function( json ){
callback( json );
} );
}
service.drivers.range = function( callback ){
settlement.drivers.range( function( json ){
callback( json );