9f9c0ef416
[+] BO Orders
2013-07-26 18:54:28 +02:00
1a2b78b00f
[+] BO Invoices
2013-07-26 15:34:11 +02:00
3c035324f4
// update order tab
2013-07-26 12:15:23 +02:00
72b046d5f0
[+] BO Manufacturers
2013-07-26 10:21:23 +02:00
9308c5c527
no message
2013-07-25 19:18:54 +02:00
488cf0919a
// BO attributes
2013-07-25 15:51:41 +02:00
b5ae321ea5
// fix input + switch
2013-07-25 11:55:27 +02:00
77f80b1774
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
.gitignore
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/page.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/orders/_documents.tpl
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/modules_list/list.tpl
classes/Tools.php
controllers/admin/AdminCartRulesController.php
controllers/admin/AdminProductsController.php
css/admin.css
2013-07-24 17:01:23 +02:00
f7d1743c8a
// fix tags in helper
2013-07-24 11:42:47 +02:00
9d16eb1d1b
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
0b4512dbcb
// some work on style sheets
2013-07-18 18:51:24 +02:00
ffb62426d8
Merge pull request #516 from PrestaEdit/patch-41
...
[*] BO: more than one image in HelperForm
2013-07-17 07:44:26 -07:00
02921dc9d0
[+] Helper form WIP
2013-07-16 19:23:46 +02:00
0c4a5bd984
// update module tab positions & payment
2013-07-15 11:55:06 +02:00
5083cd6b5e
Merge pull request #466 from PrestaEdit/patch-39
...
[*] BO: hook displayAdminForm / add param fieldset
2013-07-12 08:56:42 -07:00
c12ce3dd29
// Products
2013-07-12 17:27:25 +02:00
84c0ccbae6
// products TPL
2013-07-11 18:58:44 +02:00
0ad4b44866
// Refactor helper list + fixs
2013-07-02 18:55:43 +02:00
d583cf25d2
// Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch
2013-06-28 19:35:32 +02:00
f4a5dd1409
[*] BO: more than one image in HelperForm
2013-06-21 23:02:51 +03:00
40f03d0ba1
[+] BO: Form components
2013-06-18 21:03:43 +02:00
c04d2626f5
// Improved module list view
2013-06-18 15:34:58 +02:00
86ef69c9ba
[*] BO : Init Bootstrap (Sass) BO
2013-06-13 18:03:34 +02:00
f7f6175191
[*] BO: hook displayAdminForm / add param fieldset
2013-05-31 14:58:19 +02:00
d1c7f9c012
Merge pull request #390 from ccauw/patch-7
...
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07:00
5e9ba185ef
Merge pull request #390 from ccauw/patch-7
...
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07:00
f93c7ec8c7
[-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper
2013-04-19 10:34:20 +02:00
6e1f99f4b2
[-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper
2013-04-19 10:34:20 +02:00
f7ef4e0350
[*] BO : Add block "override_form_extra" in helper
...
[*] BO : Add block "override_form_extra" in list_header.tpl
{if !$simple_header}
<form method="post" action="{$action}" class="form">
{block name="override_form_extra"}{/block}
In AdminXxxxController, If we display list which are filtered by "variable" like
index.php?controller=AdminXxxx&variable=val&token=...
When using pagination or columns filters, the controller is called without our variable.
There are two methods to retrieve our variable: cookie or form Post.
To use the second opportunity, we need to put hidden input "variable" in the form.
So we need à block in the form to override.
2013-04-16 16:21:23 +03:00
205e21ba16
[*] BO : Add block "override_form_extra" in helper
...
[*] BO : Add block "override_form_extra" in list_header.tpl
{if !$simple_header}
<form method="post" action="{$action}" class="form">
{block name="override_form_extra"}{/block}
In AdminXxxxController, If we display list which are filtered by "variable" like
index.php?controller=AdminXxxx&variable=val&token=...
When using pagination or columns filters, the controller is called without our variable.
There are two methods to retrieve our variable: cookie or form Post.
To use the second opportunity, we need to put hidden input "variable" in the form.
So we need à block in the form to override.
2013-04-16 16:21:23 +03:00
7711c710d4
[*] BO : Add block "close_td" in list_content.tpl
...
[*] BO : Add block "close_td" in list_content.tpl
{block name="td_content"}
.....
{/block}
{block name="close_td"}
{/block}
So now we can override "td" and "/td" tags.
So we can create
"td" "a" ... content.... "/a" "/td"
when overriding the block open-td and close-td
and we can use "a" tag with "href" rather than "onclick" to create view links in the list.
And the user can choose to open the link in another tab or window.
2013-04-15 20:19:10 +03:00
6e58a24325
[*] BO : Add block "close_td" in list_content.tpl
...
[*] BO : Add block "close_td" in list_content.tpl
{block name="td_content"}
.....
{/block}
{block name="close_td"}
{/block}
So now we can override "td" and "/td" tags.
So we can create
"td" "a" ... content.... "/a" "/td"
when overriding the block open-td and close-td
and we can use "a" tag with "href" rather than "onclick" to create view links in the list.
And the user can choose to open the link in another tab or window.
2013-04-15 20:19:10 +03:00
305cf4dd9c
[-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch
2013-04-12 11:39:56 +02:00
4a1892843a
[-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch
2013-04-12 11:39:56 +02:00
8e9826743f
[-] BO : fixed Alphabetical sorting of categories
2013-03-25 17:15:57 +01:00
1b599f1886
[-] BO : fixed Alphabetical sorting of categories
2013-03-25 17:15:57 +01:00
c7bdca0eca
// Improved module list
2013-03-25 10:15:56 +01:00
9b28184d2d
// Improved module list
2013-03-25 10:15:56 +01:00
db70f38a89
// Fixed module list
2013-03-22 16:50:46 +01:00
571f566af0
// Fixed module list
2013-03-22 16:50:46 +01:00
1b7a914008
[*] BO : remove tiny_mce hard coded setup to tinymce.inc.js
2013-03-19 11:10:57 +01:00
39b120bbb4
[*] BO : remove tiny_mce hard coded setup to tinymce.inc.js
2013-03-19 11:10:57 +01:00
a6dbe24d28
[-] BO : Avoid warning if img src not defined in controller
2013-03-13 15:27:18 +01:00
3b091fad98
[-] BO : Avoid warning if img src not defined in controller
2013-03-13 15:27:18 +01:00
dfa3e0fcb0
[-] BO : Fix bug #PSCFV-7468 required phone in address creation
2013-03-11 17:39:13 +01:00
d73fcdf412
[-] BO : Fix bug #PSCFV-7468 required phone in address creation
2013-03-11 17:39:13 +01:00
602c11079d
[-] BO: improve module payment page
2013-02-20 11:08:20 +01:00
ae9b78dc0f
[-] BO: improve module payment page
2013-02-20 11:08:20 +01:00
110afe7b69
[-] BO: improve payment module page + header
2013-02-20 10:00:18 +01:00
4ce88468df
[-] BO: improve payment module page + header
2013-02-20 10:00:18 +01:00
Kevin Granger