Merge pull request #947 from inbaz/develop

changes to correct e-ticket
BigAndini · May 5, 2017 · c5bab65 · c5bab65
2 parents 3f0e524 + bb7b4ec
commit c5bab65
Show file tree

Hide file tree

Showing 39 changed files with 99 additions and 43 deletions.
diff --git a/data/ers.mwb b/data/ers.mwb
diff --git a/data/ers.mwb.bak b/data/ers.mwb.bak
diff --git a/module/Admin/src/Admin/Form/Product.php b/module/Admin/src/Admin/Form/Product.php
@@ -59,7 +59,20 @@ public function __construct($name = null)
                 'class' => 'checkbox',
             ),
             'options' => array(
-                'label' => 'Visible',
+                'label' => 'visible in shop',
+                'label_attributes' => array(
+                    'class'  => 'media-object',
+                ),
+            ),
+        ));
+        $this->add(array(
+            'type' => 'checkbox',
+            'name' => 'visible_on_eticket',
+            'attributes' => array(
+                'class' => 'checkbox',
+            ),
+            'options' => array(
+                'label' => 'visible on e-ticket',
                 'label_attributes' => array(
                     'class'  => 'media-object',
                 ),

diff --git a/module/Admin/view/admin/product/add.phtml b/module/Admin/view/admin/product/add.phtml
@@ -15,6 +15,7 @@ echo $this->formHidden($form->get('active'));
 echo $this->formHidden($form->get('deleted'));
 echo $this->formRow($form->get('position'));
 echo $this->formRow($form->get('visible'));
+echo $this->formRow($form->get('visible_on_eticket'));
 echo $this->formRow($form->get('name'));
 echo $this->formRow($form->get('short_description'));
 echo $this->formRow($form->get('long_description'));

diff --git a/module/Admin/view/admin/product/edit.phtml b/module/Admin/view/admin/product/edit.phtml
@@ -22,6 +22,7 @@ echo $this->formHidden($form->get('active'));
 echo $this->formHidden($form->get('deleted'));
 echo $this->formRow($form->get('position'));
 echo $this->formRow($form->get('visible'));
+echo $this->formRow($form->get('visible_on_eticket'));
 echo $this->formRow($form->get('name'));
 echo $this->formRow($form->get('short_description'));
 echo $this->formRow($form->get('long_description'));

diff --git a/module/Admin/view/admin/product/index.phtml b/module/Admin/view/admin/product/index.phtml
@@ -10,10 +10,11 @@ $this->headTitle($title);
 
 <table class="table">
     <tr>
-        <th>Pos.</th>
-        <th>Visible</th>
-        <th>Name</th>
-        <th>Template for E-Ticket <i class="fa fa-question-circle text-info" data-toggle="tooltip" title="Some product types can be displayed on the e-ticket via a template. If no template fits for your product request a template through an issue on github. You can find a link to the issue tracker on the bottom right of this page."></i></th>
+        <th>pos.</th>
+        <th>visible<br />in shop</th>
+        <th>visible<br />on e-ticket</th>
+        <th>name</th>
+        <th>template for e-ticket <i class="fa fa-question-circle text-info" data-toggle="tooltip" title="Some product types can be displayed on the e-ticket via a template. If no template fits for your product request a template through an issue on github. You can find a link to the issue tracker on the bottom right of this page."></i></th>
         <!--<th>Variant</th>-->
         <th>
             <a class="btn btn-sm btn-success" href="<?php echo $this->url('admin/product', array('action'=>'add'));?>"><i class="fa fa-plus"></i> <?php echo _('product'); ?></a>
@@ -29,6 +30,13 @@ $this->headTitle($title);
                 <i class="fa fa-lg fa-eye-slash"></i>
             <?php endif; ?>
         </td>
+        <td>
+            <?php if($product->getVisibleOnEticket()) : ?>
+                <i class="fa fa-lg fa-eye"></i>
+            <?php else: ?>
+                <i class="fa fa-lg fa-eye-slash"></i>
+            <?php endif; ?>
+        </td>
         <td><?php 
             if($product->getPersonalized()) : ?> 
                 <!--<img src="/img/icons/32px/user.png" alt="(personalized)" title="This product needs to be linked to a user" />-->

diff --git a/module/ErsBase/Module.php b/module/ErsBase/Module.php
@@ -165,7 +165,7 @@ public function getServiceConfig() {
                     $service->setServiceLocator($sm);
                     $em = $sm->get('Doctrine\ORM\EntityManager');
                     $products = $em->getRepository('ErsBase\Entity\Product')
-                                ->findBy(array('visible' => '1'), array('position' => 'ASC'));
+                                ->findBy(array('visible_on_eticket' => '1'), array('position' => 'ASC'));
                     $service->setProducts($products);
                     return $service;
                 },

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Agegroup.php b/module/ErsBase/src/ErsBase/Entity/Base/Agegroup.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/BankAccountCsv.php b/module/ErsBase/src/ErsBase/Entity/Base/BankAccountCsv.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/BankStatement.php b/module/ErsBase/src/ErsBase/Entity/Base/BankStatement.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/BankStatementCol.php b/module/ErsBase/src/ErsBase/Entity/Base/BankStatementCol.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Code.php b/module/ErsBase/src/ErsBase/Entity/Base/Code.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Counter.php b/module/ErsBase/src/ErsBase/Entity/Base/Counter.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Country.php b/module/ErsBase/src/ErsBase/Entity/Base/Country.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Currency.php b/module/ErsBase/src/ErsBase/Entity/Base/Currency.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Deadline.php b/module/ErsBase/src/ErsBase/Entity/Base/Deadline.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Item.php b/module/ErsBase/src/ErsBase/Entity/Base/Item.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/ItemPackage.php b/module/ErsBase/src/ErsBase/Entity/Base/ItemPackage.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/ItemVariant.php b/module/ErsBase/src/ErsBase/Entity/Base/ItemVariant.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Language.php b/module/ErsBase/src/ErsBase/Entity/Base/Language.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Log.php b/module/ErsBase/src/ErsBase/Entity/Base/Log.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Match.php b/module/ErsBase/src/ErsBase/Entity/Base/Match.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Order.php b/module/ErsBase/src/ErsBase/Entity/Base/Order.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-04-17 14:11:19.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Package.php b/module/ErsBase/src/ErsBase/Entity/Base/Package.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/PackageStatus.php b/module/ErsBase/src/ErsBase/Entity/Base/PackageStatus.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/PaymentDetail.php b/module/ErsBase/src/ErsBase/Entity/Base/PaymentDetail.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/PaymentType.php b/module/ErsBase/src/ErsBase/Entity/Base/PaymentType.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Product.php b/module/ErsBase/src/ErsBase/Entity/Base/Product.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */
@@ -68,6 +68,11 @@ abstract class Product
      */
     protected $visible;
 
+    /**
+     * @ORM\Column(name="`visible_on_eticket`", type="boolean", nullable=true)
+     */
+    protected $visible_on_eticket;
+
     /**
      * @ORM\Column(name="`deleted`", type="boolean", nullable=true)
      */
@@ -365,6 +370,29 @@ public function getVisible()
         return $this->visible;
     }
 
+    /**
+     * Set the value of visible_on_eticket.
+     *
+     * @param boolean $visible_on_eticket
+     * @return \ErsBase\Entity\Base\Product
+     */
+    public function setVisibleOnEticket($visible_on_eticket)
+    {
+        $this->visible_on_eticket = $visible_on_eticket;
+
+        return $this;
+    }
+
+    /**
+     * Get the value of visible_on_eticket.
+     *
+     * @return boolean
+     */
+    public function getVisibleOnEticket()
+    {
+        return $this->visible_on_eticket;
+    }
+
     /**
      * Set the value of deleted.
      *
@@ -713,7 +741,7 @@ public function populate(array $data = array())
      */
     public function getArrayCopy(array $fields = array())
     {
-        $dataFields = array('id', 'tax_id', 'position', 'display_name', 'name', 'short_description', 'long_description', 'active', 'visible', 'deleted', 'personalized', 'ticket_template', 'updated', 'created');
+        $dataFields = array('id', 'tax_id', 'position', 'display_name', 'name', 'short_description', 'long_description', 'active', 'visible', 'visible_on_eticket', 'deleted', 'personalized', 'ticket_template', 'updated', 'created');
         $relationFields = array('tax');
         $copiedFields = array();
         foreach ($relationFields as $relationField) {
@@ -746,6 +774,6 @@ public function getArrayCopy(array $fields = array())
 
     public function __sleep()
     {
-        return array('id', 'tax_id', 'position', 'display_name', 'name', 'short_description', 'long_description', 'active', 'visible', 'deleted', 'personalized', 'ticket_template', 'updated', 'created');
+        return array('id', 'tax_id', 'position', 'display_name', 'name', 'short_description', 'long_description', 'active', 'visible', 'visible_on_eticket', 'deleted', 'personalized', 'ticket_template', 'updated', 'created');
     }
 }
diff --git a/module/ErsBase/src/ErsBase/Entity/Base/ProductPackage.php b/module/ErsBase/src/ErsBase/Entity/Base/ProductPackage.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/ProductPrice.php b/module/ErsBase/src/ErsBase/Entity/Base/ProductPrice.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/ProductVariant.php b/module/ErsBase/src/ErsBase/Entity/Base/ProductVariant.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/ProductVariantValue.php b/module/ErsBase/src/ErsBase/Entity/Base/ProductVariantValue.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Role.php b/module/ErsBase/src/ErsBase/Entity/Base/Role.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Setting.php b/module/ErsBase/src/ErsBase/Entity/Base/Setting.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Status.php b/module/ErsBase/src/ErsBase/Entity/Base/Status.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/Tax.php b/module/ErsBase/src/ErsBase/Entity/Base/Tax.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-03-06 16:58:38.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2017-05-05 22:04:45.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */