diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index 2f2ad63db..82c3a97d5 100644 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -73,6 +73,8 @@ class CouponController extends BaseAdminController Router::ABSOLUTE_URL ); + $args['coupon_order'] = $this->getListOrderFromSession('coupon', 'coupon_order', 'code'); + return $this->render('coupon-list', $args); } @@ -856,5 +858,4 @@ class CouponController extends BaseAdminController ) ); } - } diff --git a/templates/backOffice/default/coupon-list.html b/templates/backOffice/default/coupon-list.html index 4ba344601..30a3327b7 100644 --- a/templates/backOffice/default/coupon-list.html +++ b/templates/backOffice/default/coupon-list.html @@ -14,22 +14,25 @@
+ {module_include location='coupon_top'} +| {block name="coupon-label-code"}{intl l='Code'}{/block} | -{block name="coupon-label-title"}{intl l='Title'}{/block} | -{block name="coupon-label-expiration-date"}{intl l='Days before expiration'}{/block} | -{block name="coupon-label-usage-left"}{intl l='Usage left'}{/block} | -{block name="coupon-label-action"}{/block} | -
|---|---|---|---|---|
| {block name="coupon-code"}{$CODE}{/block} | -{block name="coupon-title"}{$TITLE}{/block} | -{block name="coupon-expiration-date"}{$DAY_LEFT_BEFORE_EXPIRATION}{/block} | -- {block name="coupon-usage-left"} - {if $USAGE_LEFT == -1} - - {intl l="Unlimited"} - - {elseif $USAGE_LEFT} - - {$USAGE_LEFT} - - {else} - - 0 - - {/if} - {/block} - | -- {block name="coupon-action"} - - {intl l='Edit'} - - {/block} - | -
| {block name="coupon-label-code"}{intl l='Code'}{/block} | -{block name="coupon-label-title"}{intl l='Title'}{/block} | -{block name="coupon-label-expiration-date"}{intl l='Expiration date'}{/block} | -{block name="coupon-label-usage-left"}{intl l='Usage left'}{/block} | -{block name="coupon-label-action"}{/block} | +{admin_sortable_header + current_order=$coupon_order + order='title' + reverse_order='title-reverse' + path={url path='/admin/coupon'} + request_parameter_name='coupon_order' + label="{intl l='Title'}" + } + | + +{admin_sortable_header + current_order=$coupon_order + order='enabled' + reverse_order='enabled-reverse' + path={url path='/admin/coupon'} + request_parameter_name='coupon_order' + label="{intl l='Status'}" + } + | + +{admin_sortable_header + current_order=$coupon_order + order='expiration-date' + reverse_order='expiration-date-reverse' + path={url path='/admin/coupon'} + request_parameter_name='coupon_order' + label="{intl l='Expiration date'}" + } + | + +{admin_sortable_header + current_order=$coupon_order + order='days-left' + reverse_order='days-left-reverse' + path={url path='/admin/coupon'} + request_parameter_name='coupon_order' + label="{intl l='Days before expiration'}" + } + | + +{admin_sortable_header + current_order=$coupon_order + order='usages-left' + reverse_order='usages-left-reverse' + path={url path='/admin/coupon'} + request_parameter_name='coupon_order' + label="{intl l='Usages left'}" + } + | + + {module_include location='coupon_table_header'} + +|
|---|---|---|---|---|---|---|---|---|---|---|
| {block name="coupon-code"}{$CODE}{/block} | -{block name="coupon-title"}{$TITLE}{/block} | -{block name="coupon-expiration-date"}{$EXPIRATION_DATE}{/block} | - {block name="coupon-usage-left"} - {if $USAGE_LEFT == -1} - - {intl l="Unlimited"} - - {elseif $USAGE_LEFT} - - {$USAGE_LEFT} - - {else} - - 0 - - {/if} - {/block} + {loop type="auth" name="can_change" role="ADMIN" resource="admin.coupon" access="UPDATE"} + {$CODE} + {/loop} + {elseloop rel="can_change"} + {$CODE} + {/elseloop} | -- {block name="coupon-action"} - - {intl l='Edit'} - - {/block} + + | {$TITLE} | + ++ {if $IS_ENABLED} + {intl l="Enabled"} + {else} + {intl l="Disabled"} + {/if} + | + +{format_date date=$EXPIRATION_DATE output="date"} | + ++ {if $DAY_LEFT_BEFORE_EXPIRATION <= 0} + {intl l='Expired'} + {else} + {$DAY_LEFT_BEFORE_EXPIRATION} + {/if} + | + ++ {if $USAGE_LEFT == -1} + {intl l="Unlimited"} + {elseif $USAGE_LEFT} + {$USAGE_LEFT} + {else} + 0 + {/if} + | + + {module_include location='coupon_table_row'} + ++ {loop type="auth" name="can_change" role="ADMIN" resource="admin.coupon" access="UPDATE"} + + {/loop} |