dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[+] BO Orders

Browse Source
This commit is contained in:
Kevin Granger
2013-07-26 18:54:28 +02:00
parent c1e4b812f9
commit 9f9c0ef416
12 changed files with 204 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminDeliverySlipController.php
+5 -8
View File
@@ -40,13 +40,11 @@ class AdminDeliverySlipControllerCore extends AdminController
'PS_DELIVERY_PREFIX' => array(
'title' => $this->l('Delivery prefix:'),
'desc' => $this->l('Prefix used for delivery slips'),
'size' => 6,
'type' => 'textLang'
),
'PS_DELIVERY_NUMBER' => array(
'title' => $this->l('Delivery number:'),
'desc' => $this->l('The next delivery slip will begin with this number and then increase with each additional slip.'),
'size' => 6,
'cast' => 'intval',
'type' => 'text'
)
@@ -63,31 +61,30 @@ class AdminDeliverySlipControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Print PDF delivery slips'),
'image' => '../img/admin/AdminPdf.gif'
'icon' => 'icon-print'
),
'input' => array(
array(
'type' => 'date',
'label' => $this->l('From:'),
'name' => 'date_from',
'size' => 20,
'maxlength' => 10,
'required' => true,
'desc' => $this->l('Format: 2011-12-31 (inclusive)')
'hint' => $this->l('Format: 2011-12-31 (inclusive)')
),
array(
'type' => 'date',
'label' => $this->l('To:'),
'name' => 'date_to',
'size' => 20,
'maxlength' => 10,
'required' => true,
'desc' => $this->l('Format: 2012-12-31 (inclusive)')
'hint' => $this->l('Format: 2012-12-31 (inclusive)')
)
),
'submit' => array(
'title' => $this->l('Generate PDF file'),
'class' => 'button'
'class' => 'btn btn-primary',
'icon' => 'icon-download-alt'
)
);
controllers/admin/AdminInvoicesController.php
+1 -1
View File
@@ -132,7 +132,7 @@ class AdminInvoicesControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('By order status'),
'icon' => 'icon-pushpin'
'icon' => 'icon-time'
),
'input' => array(
array(
controllers/admin/AdminOrderMessageController.php
+3 -8
View File
@@ -46,16 +46,13 @@ class AdminOrderMessageControllerCore extends AdminController
$this->fields_list = array(
'id_order_message' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name'),
'width' => 140
'title' => $this->l('Name')
),
'message' => array(
'title' => $this->l('Message'),
'width' => 600,
'maxlength' => 300
)
);
@@ -63,7 +60,7 @@ class AdminOrderMessageControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Order messages'),
'image' => '../img/admin/email.gif'
'icon' => 'icon-mail'
),
'input' => array(
array(
@@ -79,8 +76,6 @@ class AdminOrderMessageControllerCore extends AdminController
'lang' => true,
'label' => $this->l('Message:'),
'name' => 'message',
'cols' => 50,
'rows' => 15,
'required' => true
)
),
controllers/admin/AdminOrdersController.php
+3 -12
View File
@@ -64,17 +64,14 @@ class AdminOrdersControllerCore extends AdminController
$this->fields_list = array(
'id_order' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'reference' => array(
'title' => $this->l('Reference'),
'align' => 'center',
'width' => 65
'align' => 'center'
),
'new' => array(
'title' => $this->l('New'),
'width' => 25,
'align' => 'center',
'type' => 'bool',
'tmpTableFilter' => true,
@@ -93,7 +90,6 @@ class AdminOrdersControllerCore extends AdminController
),
'total_paid_tax_incl' => array(
'title' => $this->l('Total'),
'width' => 70,
'align' => 'right',
'prefix' => '<b>',
'suffix' => '</b>',
@@ -101,13 +97,11 @@ class AdminOrdersControllerCore extends AdminController
'currency' => true
),
'payment' => array(
'title' => $this->l('Payment: '),
'width' => 100
'title' => $this->l('Payment: ')
),
'osname' => array(
'title' => $this->l('Status'),
'color' => 'color',
'width' => 280,
'type' => 'select',
'list' => $statuses_array,
'filter_key' => 'os!id_order_state',
@@ -115,14 +109,12 @@ class AdminOrdersControllerCore extends AdminController
),
'date_add' => array(
'title' => $this->l('Date'),
'width' => 130,
'align' => 'right',
'type' => 'datetime',
'filter_key' => 'a!date_add'
),
'id_pdf' => array(
'title' => $this->l('PDF'),
'width' => 35,
'align' => 'center',
'callback' => 'printPDFIcons',
'orderby' => false,
@@ -2258,4 +2250,3 @@ class AdminOrdersControllerCore extends AdminController
$order_invoice->update();
}
}
controllers/admin/AdminSlipController.php
+6 -10
View File
@@ -35,7 +35,6 @@ class AdminSlipControllerCore extends AdminController
'id_order_slip' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
),
'id_order' => array(
'title' => $this->l('ID Order'),
@@ -43,13 +42,11 @@ class AdminSlipControllerCore extends AdminController
),
'date_add' => array(
'title' => $this->l('Date issued'),
'width' => 150,
'type' => 'date',
'align' => 'right'
),
'id_pdf' => array(
'title' => $this->l('PDF'),
'width' => 35,
'align' => 'center',
'callback' => 'printPDFIcons',
'orderby' => false,
@@ -83,32 +80,31 @@ class AdminSlipControllerCore extends AdminController
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Print a PDF'),
'image' => '../img/admin/pdf.gif'
'icon' => 'icon-print'
),
'input' => array(
array(
'type' => 'date',
'label' => $this->l('From:'),
'name' => 'date_from',
'size' => 20,
'maxlength' => 10,
'required' => true,
'desc' => $this->l('Format: 2011-12-31 (inclusive)')
'hint' => $this->l('Format: 2011-12-31 (inclusive)')
),
array(
'type' => 'date',
'label' => $this->l('To:'),
'name' => 'date_to',
'size' => 20,
'maxlength' => 10,
'required' => true,
'desc' => $this->l('Format: 2012-12-31 (inclusive)')
'hint' => $this->l('Format: 2012-12-31 (inclusive)')
)
),
'submit' => array(
'title' => $this->l('Generate PDF file'),
'class' => 'button',
'id' => 'submitPrint'
'class' => 'btn btn-primary',
'id' => 'submitPrint',
'icon' => 'icon-download-alt'
)
);
controllers/admin/AdminStatusesController.php
+20 -25
View File
@@ -73,8 +73,7 @@ class AdminStatusesControllerCore extends AdminController
$this->fields_list = array(
'id_order_state' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name'),
@@ -85,7 +84,6 @@ class AdminStatusesControllerCore extends AdminController
'title' => $this->l('Icon'),
'align' => 'center',
'image' => 'os',
'width' => 25,
'orderby' => false,
'search' => false
),
@@ -96,14 +94,12 @@ class AdminStatusesControllerCore extends AdminController
'1' => 'enabled.gif',
'0' => 'disabled.gif'
),
'width' => 190,
'type' => 'bool',
'orderby' => false
),
'delivery' => array(
'title' => $this->l('Delivery'),
'align' => 'center',
'width' => 25,
'icon' => array(
'1' => 'enabled.gif',
'0' => 'disabled.gif'
@@ -115,7 +111,6 @@ class AdminStatusesControllerCore extends AdminController
'invoice' => array(
'title' => $this->l('Invoice'),
'align' => 'center',
'width' => 25,
'icon' => array(
'1' => 'enabled.gif',
'0' => 'disabled.gif'
@@ -124,8 +119,7 @@ class AdminStatusesControllerCore extends AdminController
'orderby' => false
),
'template' => array(
'title' => $this->l('Email template'),
'width' => 120
'title' => $this->l('Email template')
)
);
}
@@ -146,8 +140,7 @@ class AdminStatusesControllerCore extends AdminController
$this->fields_list = array(
'id_order_return_state' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name'),
@@ -245,7 +238,7 @@ class AdminStatusesControllerCore extends AdminController
'tinymce' => true,
'legend' => array(
'title' => $this->l('Order status'),
'image' => '../img/admin/time.gif'
'icon' => 'icon-time'
),
'input' => array(
array(
@@ -253,23 +246,23 @@ class AdminStatusesControllerCore extends AdminController
'label' => $this->l('Status name:'),
'name' => 'name',
'lang' => true,
'size' => 40,
'required' => true,
'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
'desc' => $this->l('Order status (e.g. \'Pending\')')
'hint' => array(
$this->l('Order status (e.g. \'Pending\')'),
$this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:'
)
),
array(
'type' => 'file',
'label' => $this->l('Icon:'),
'name' => 'icon',
'desc' => $this->l('Upload an icon from your computer (File type: .gif, suggested size: 16x16)')
'hint' => $this->l('Upload an icon from your computer (File type: .gif, suggested size: 16x16)')
),
array(
'type' => 'color',
'label' => $this->l('Color:'),
'name' => 'color',
'size' => 30,
'desc' => $this->l('Status will be highlighted in this color. (HTML colors only)').' "lightblue", "#CC6600")'
'hint' => $this->l('Status will be highlighted in this color. (HTML colors only)').' "lightblue", "#CC6600")'
),
array(
'type' => 'checkbox',
@@ -358,8 +351,10 @@ class AdminStatusesControllerCore extends AdminController
'id' => 'id',
'name' => 'name'
),
'hint' => $this->l('Only letters, number and hashtags are allowed.'),
'desc' => $this->l('Email template for both .html and .txt')
'hint' => array(
$this->l('Only letters, number and hashtags are allowed.'),
$this->l('Email template for both .html and .txt')
)
)
),
'submit' => array(
@@ -392,7 +387,7 @@ class AdminStatusesControllerCore extends AdminController
'tinymce' => true,
'legend' => array(
'title' => $this->l('Order status'),
'image' => '../img/admin/time.gif'
'icon' => 'icon-time'
),
'input' => array(
array(
@@ -400,17 +395,17 @@ class AdminStatusesControllerCore extends AdminController
'label' => $this->l('Status name:'),
'name' => 'name',
'lang' => true,
'size' => 40,
'required' => true,
'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
'desc' => $this->l('Order\'s return status name')
'hint' => array(
$this->l('Order\'s return status name'),
$this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:'
)
),
array(
'type' => 'color',
'label' => $this->l('Color:'),
'name' => 'color',
'size' => 30,
'desc' => $this->l('Status will be highlighted in this color. (HTML colors only)').' "lightblue", "#CC6600")'
'hint' => $this->l('Status will be highlighted in this color. (HTML colors only)').' "lightblue", "#CC6600")'
)
),
'submit' => array(