Merge pull request #468 from alch/feature/stackable-coupons

WIP: Added stackable coupon configuration
elcodi · May 19, 2015 · e232514 · e232514
2 parents 9f1187e + da6e9e4
commit e232514
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.en.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.en.yml
@@ -364,6 +364,8 @@ admin:
                 options:
                     manual: Manual application
                     automatic: Automatic application
+            stackable:
+                title: This coupon can be applied when other coupons are present
             minimum_purchase:
                 title: Minimum purchase
             price:

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.es.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.es.yml
@@ -365,6 +365,8 @@ admin:
                 options:
                     manual: Aplicación manual
                     automatic: Aplicación automática
+            stackable:
+                title: Este cupon se puede utilizar con otros cupones
             minimum_purchase:
                 title: Compra mínima
             price:

diff --git a/src/Elcodi/Admin/CouponBundle/Form/Type/CouponType.php b/src/Elcodi/Admin/CouponBundle/Form/Type/CouponType.php
@@ -116,6 +116,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('minimumPurchase', 'money_object', [
                 'required' => false,
             ])
+            ->add('stackable', 'checkbox', [
+                'required' => false
+            ])
             ->add('rule', 'entity', [
                 'class'       => $this->ruleNamespace,
                 'required'    => false,

diff --git a/src/Elcodi/Admin/CouponBundle/Resources/views/Coupon/editComponent.html.twig b/src/Elcodi/Admin/CouponBundle/Resources/views/Coupon/editComponent.html.twig
@@ -55,6 +55,16 @@
                             {{ form_row(form.enforcement, { label: 'admin.coupon.field.enforcement.title' } ) }}
                         </li>
                     </ol>
+                    <ol>
+                        <li>
+                            {{
+                            form_row(form.stackable, {
+                                label: 'admin.coupon.field.stackable.title',
+                            })
+                            }}
+                        </li>
+                    </ol>
+
                 </div>
             </div>
         </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,16 @@ @@
                                 {{ form_row(form.enforcement, { label: 'admin.coupon.field.enforcement.title' } ) }}
                             </li>
                         </ol>
+                        <ol>
+                            <li>
+                                {{
+                                form_row(form.stackable, {
+                                    label: 'admin.coupon.field.stackable.title',
+                                })
+                                }}
+                            </li>
+                        </ol>
                     </div>
                 </div>
             </div>
@@ Expand Down @@