Merge branch 'develop' into hourly
This commit is contained in:
@@ -2384,7 +2384,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Order Date');
|
||||
$helper->tooltip = $this->l('The date when the order was placed.');
|
||||
$helper->value = Tools::displayDate($objOrder->date_add);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-order-total';
|
||||
@@ -2393,7 +2393,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Bookings Total');
|
||||
$helper->tooltip = $this->l('Total booking amount of this order.');
|
||||
$helper->value = Tools::displayPrice($objOrder->total_paid_tax_incl, new Currency($objOrder->id_currency));
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-total-paid';
|
||||
@@ -2402,7 +2402,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Total Paid');
|
||||
$helper->tooltip = $this->l('Total paid is the amount which customer has already paid for this order.');
|
||||
$helper->value = Tools::displayPrice($objOrder->total_paid_real, new Currency($objOrder->id_currency));
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-total-due';
|
||||
@@ -2411,7 +2411,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Total Due');
|
||||
$helper->tooltip = $this->l('Total due is the amount which customer has to pay for this order.');
|
||||
$helper->value = Tools::displayPrice(($objOrder->total_paid_tax_incl - $objOrder->total_paid_real), new Currency($objOrder->id_currency));
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$orderHistory = array_reverse($objOrder->getHistory($this->context->language->id));
|
||||
$helper = new HelperKpi();
|
||||
@@ -2422,7 +2422,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->tooltip = $this->l('Order source shows from which source the order was placed.');
|
||||
$helper->subtitle = $orderHistory[0]['id_employee'] ? $this->l('Back office') : $this->l('Front office');
|
||||
$helper->value = $objOrder->source;
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-messages';
|
||||
@@ -2432,7 +2432,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->tooltip = $this->l('Messages is the number of customer messages for this order.');
|
||||
$helper->href = $this->context->link->getAdminLink('AdminCustomerThreads').'&id_order='.$objOrder->id;
|
||||
$helper->value = count(CustomerThread::getCustomerMessages($objOrder->id_customer, null, $objOrder->id));
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$objHotelBookingDetail = new HotelBookingDetail();
|
||||
$numRooms = count($objHotelBookingDetail->getBookingDataByOrderId($objOrder->id));
|
||||
@@ -2444,7 +2444,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->tooltip = $this->l('Total rooms is the number of rooms booked in this order.');
|
||||
$helper->href = '#start_products';
|
||||
$helper->value = $numRooms;
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-payment-type';
|
||||
@@ -2453,7 +2453,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Payment Type');
|
||||
$helper->tooltip = $this->l('The payment type refers to the type of payment that customer selected while placing this order.');
|
||||
$helper->value = $objOrder->is_advance_payment ? $this->l('Partial Payment') : $this->l('Full Payment');
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
if ($objOrder->is_advance_payment) {
|
||||
$helper = new HelperKpi();
|
||||
@@ -2463,7 +2463,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Partial Payment Amount');
|
||||
$helper->tooltip = $this->l('Partial payment amount refers to the amount that customer has to pay as advance payment, if payment type selected as partial payment while placing this order.');
|
||||
$helper->value = Tools::displayPrice($objOrder->advance_paid_amount, new Currency($objOrder->id_currency));
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
}
|
||||
|
||||
$objOrderReturn = new OrderReturn();
|
||||
@@ -2476,7 +2476,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Refunded Amount');
|
||||
$helper->tooltip = $this->l('Refunded amount refers to the amount that has been refunded for this order.');
|
||||
$helper->value = Tools::displayPrice($refundedAmount, new Currency($objOrder->id_currency));
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
}
|
||||
} else {
|
||||
$time = time();
|
||||
@@ -2489,7 +2489,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Total Sales', null, null, false);
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_sales';
|
||||
$helper->tooltip = $this->l('Total sales/revenue of all the orders created.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-total-due-amount';
|
||||
@@ -2499,7 +2499,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->href = $this->context->link->getAdminLink('AdminOrders').'&submitResetorder=1&due_amount_orders=1';
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_due_amount';
|
||||
$helper->tooltip = $this->l('Total due amount of all the orders created.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$arivalDate = date('Y-m-d');
|
||||
$helper = new HelperKpi();
|
||||
@@ -2511,7 +2511,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->href = $this->context->link->getAdminLink('AdminOrders').'&orders_arrival_today=1';
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=today_arrivals';
|
||||
$helper->tooltip = $this->l('Total number of arrivals for today.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$departureDate = date('Y-m-d');
|
||||
$helper = new HelperKpi();
|
||||
@@ -2523,7 +2523,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->href = $this->context->link->getAdminLink('AdminOrders').'&orders_departures_today=1';
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=today_departures';
|
||||
$helper->tooltip = $this->l('Total number of departures for today.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$dateFrom = date('Y-m-d');
|
||||
$dateTo = date('Y-m-d', strtotime('+1 day'));
|
||||
@@ -2536,7 +2536,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->href = $this->context->link->getAdminLink('AdminOrders').'&orders_stay_over=1';
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=today_stay_over';
|
||||
$helper->tooltip = $this->l('Total number of stay overs for today.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-carts';
|
||||
@@ -2549,7 +2549,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->href = $this->context->link->getAdminLink('AdminCarts').'&action=filterOnlyAbandonedCarts&date_from='.$dateFrom.'&date_to='.$dateTo;
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=abandoned_cart';
|
||||
$helper->tooltip = $this->l('Total number of abandoned carts in given period of time.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$daysForConversionRate = Configuration::get('PS_KPI_CONVERSION_RATE_NB_DAYS');
|
||||
$helper = new HelperKpi();
|
||||
@@ -2560,7 +2560,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->subtitle = $daysForConversionRate.' '.$this->l('days', null, null, false);
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=conversion_rate';
|
||||
$helper->tooltip = $this->l('Percentage of visits that resulted in an order/booking in given period of time.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$daysForAvgOrderVal = Configuration::get('PS_ORDER_KPI_AVG_ORDER_VALUE_NB_DAYS');
|
||||
$helper = new HelperKpi();
|
||||
@@ -2571,7 +2571,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->subtitle = $daysForAvgOrderVal.' '.$this->l('days', null, null, false);
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_order_value';
|
||||
$helper->tooltip = $this->l('Total average order value without tax in given period of time.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-average-lead-time';
|
||||
@@ -2580,7 +2580,7 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Average Lead Time', null, null, false);
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_lead_time';
|
||||
$helper->tooltip = $this->l('Average number of days between the time guests book their rooms and the time guest schedule to arrive at the hotel.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
|
||||
$helper = new HelperKpi();
|
||||
$helper->id = 'box-average-guest-in-booking';
|
||||
@@ -2589,16 +2589,14 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$helper->title = $this->l('Average Guest Per Booking', null, null, false);
|
||||
$helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_guest_in_booking';
|
||||
$helper->tooltip = $this->l('Average number of guests per booking.', null, null, false);
|
||||
$kpis[] = $helper;
|
||||
$this->kpis[] = $helper;
|
||||
}
|
||||
|
||||
Hook::exec('action'.$this->controller_name.'KPIListingModifier', array(
|
||||
'kpis' => &$kpis,
|
||||
));
|
||||
|
||||
$helper = new HelperKpiRow();
|
||||
$helper->kpis = $kpis;
|
||||
return $helper->generate();
|
||||
return parent::renderKpis();
|
||||
}
|
||||
|
||||
public function renderView()
|
||||
@@ -5039,11 +5037,15 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$newTotalPriceTaxExcl = $newNumDays * $objRoomTypeServiceProductOrderDetail->quantity * $unitPriceTaxExcl; $unitPriceTaxIncl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl;
|
||||
$newTotalPriceTaxIncl = $newNumDays * $objRoomTypeServiceProductOrderDetail->quantity * $unitPriceTaxIncl;
|
||||
|
||||
$objOrder->total_products -= $objRoomTypeServiceProductOrderDetail->total_price_tax_excl;
|
||||
$objOrder->total_products_wt -= $objRoomTypeServiceProductOrderDetail->total_price_tax_incl;
|
||||
$objOrder->total_paid_tax_excl -= $objRoomTypeServiceProductOrderDetail->total_price_tax_excl;
|
||||
$objOrder->total_paid_tax_incl -= $objRoomTypeServiceProductOrderDetail->total_price_tax_incl;
|
||||
$objOrder->total_paid -= $objRoomTypeServiceProductOrderDetail->total_price_tax_incl;
|
||||
|
||||
// change order total
|
||||
$objOrder->total_products += $newTotalPriceTaxExcl;
|
||||
$objOrder->total_products_wt += $newTotalPriceTaxIncl;
|
||||
$objOrder->total_paid_tax_excl += $newTotalPriceTaxExcl;
|
||||
$objOrder->total_paid_tax_incl += $newTotalPriceTaxIncl;
|
||||
$objOrder->total_paid += $newTotalPriceTaxIncl;
|
||||
@@ -6309,6 +6311,8 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$res &= $order_invoice->update();
|
||||
}
|
||||
|
||||
$order->total_products += $priceDiffTaxExcl;
|
||||
$order->total_products_wt += $priceDiffTaxIncl;
|
||||
$order->total_paid_tax_excl += $priceDiffTaxExcl;
|
||||
$order->total_paid_tax_incl += $priceDiffTaxIncl;
|
||||
$order->total_paid += $priceDiffTaxIncl;
|
||||
@@ -6374,6 +6378,8 @@ class AdminOrdersControllerCore extends AdminController
|
||||
$res &= $objOrderInvoice->update();
|
||||
}
|
||||
|
||||
$order->total_products -= $priceTaxExcl;
|
||||
$order->total_products_wt -= $priceTaxIncl;
|
||||
$order->total_paid_tax_excl -= $priceTaxExcl;
|
||||
$order->total_paid_tax_incl -= $priceTaxIncl;
|
||||
$order->total_paid -= $priceTaxIncl;
|
||||
|
||||
Reference in New Issue
Block a user