diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 05288cd45..1f3eb0d01 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -186,7 +186,7 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0 #productBox { position:relative; width:100%; float:left;} /*tab-pane*/ -form#product, form#access_form{ background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px; margin-left:140px;} +form#product, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px; margin-left:140px;} /*form.defaultForm{ background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px;}*/ .tab-row {} .tab-row .tab {background:#EFEFEF;width:100px;} diff --git a/admin-dev/themes/template/cart_rules/conditions.tpl b/admin-dev/themes/template/cart_rules/conditions.tpl index 79901fd46..9bcbdbe76 100644 --- a/admin-dev/themes/template/cart_rules/conditions.tpl +++ b/admin-dev/themes/template/cart_rules/conditions.tpl @@ -7,9 +7,9 @@
{l s='Default period is one year.'}
|
+ {if $currentObject->id}{/if}
+
+
+
+
+
+ {foreach from=$languages item=language}
+
+
+
+
+ {/foreach}
+ {l s='Will be displayed in the cart summary as well as on the invoice.'} +
+
+
+
+
+ {l s='Optional, the rule will automatically be applied if you leave this field blank.'} +
+
+ getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
+
+
+ getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
+
+
+
+
+ {l s='Only applicable if the voucher value is greater than the cart total.'}
+
+
+
+ {l s='Cart rules are applied to the cart by priority. A cart rule with priority of "1" will be processed before a cart rule with a priority of "2".'} +
+
+ getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
+
+
+ getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
+
+
+ |
+
+
+
+
+
+ {l s='For you only, never displayed to the customer.'} + |
+