Merge branch 'develop' into text-changes-2

This commit is contained in:
Abhishek Kumar
2024-03-15 19:38:46 +05:30
435 changed files with 13019 additions and 10795 deletions

View File

@@ -58,6 +58,18 @@ class AdminOrderPreferencesControllerCore extends AdminController
)
);
// Options to display currency in order list
$displayCurrencyOptions = array(
array(
'value' => Order::ORDER_LIST_PRICE_DISPLAY_IN_PAYMENT_CURRENCY,
'name' => $this->l('Order currency')
),
array(
'value' => Order::ORDER_LIST_PRICE_DISPLAY_IN_DEFAULT_CURRENCY,
'name' => $this->l('Default currency')
)
);
$this->fields_options = array(
'order_restrict' => array(
'title' => $this->l('Order Restrict'),
@@ -159,6 +171,16 @@ class AdminOrderPreferencesControllerCore extends AdminController
'cast' => 'intval',
'type' => 'bool'
),
'PS_ORDER_LIST_PRICE_DISPLAY_CURRENCY' => array(
'title' => $this->l('Display order list prices in'),
'hint' => $this->l('Choose the currency in which you want the prices in the order list to be displayed.'),
'desc' => $this->l('\'Order currency\' is the currency in which customer created the order and \'Default currency\' is the currency configured in localization.'),
'validation' => 'isInt',
'type' => 'select',
'cast' => 'intval',
'list' => $displayCurrencyOptions,
'identifier' => 'value',
),
),
'submit' => array('title' => $this->l('Save'))
),