Merge pull request #904 from inbaz/develop

added payment reminder
BigAndini · Oct 25, 2016 · 9191476 · 9191476
2 parents ded3293 + de53c75
commit 9191476
Show file tree

Hide file tree

Showing 33 changed files with 89 additions and 38 deletions.
diff --git a/data/ers.mwb b/data/ers.mwb
diff --git a/module/Admin/src/Admin/Controller/CronController.php b/module/Admin/src/Admin/Controller/CronController.php
@@ -423,15 +423,31 @@ public function sendPaymentReminderAction() {
         $em = $this->getServiceLocator()
             ->get('Doctrine\ORM\EntityManager');
 
+        $qb1 = $em->getRepository('ErsBase\Entity\Order')->createQueryBuilder('o');
+        $qb1->where($qb1->expr()->isNull('o.payment_reminder_status'));
+
+        $correctOrders = $qb1->getQuery()->getResult();
+
+        echo "found ".count($correctOrders)." orders to correct".PHP_EOL;
+        foreach($correctOrders as $o) {
+            $o->setPaymentReminderStatus(0);
+            $em->persist($o);
+        }
+        $em->flush();
+
+        #$limit = 3;
         $qb = $em->getRepository('ErsBase\Entity\Order')->createQueryBuilder('o');
         $qb->join('o.status', 's');
         $qb->where($qb->expr()->eq('s.value', ':status'));
         $qb->andWhere($qb->expr()->lt('o.created', ':paymentTarget'));
+        $qb->andWhere($qb->expr()->eq('o.payment_reminder_status', ':prstatus'));
         $qb->setParameter('status', 'ordered');
         $paymentTarget = new \DateTime;
-        #$paymentTarget->modify( '-'.(date('d')-5).' day' );
         $paymentTarget->modify( '-5 days' );
         $qb->setParameter('paymentTarget', $paymentTarget);
+        $qb->setParameter('prstatus', '0');
+        #$qb->setFirstResult( $offset )
+        #$qb->setMaxResults( $limit );
 
         $notPaidOrders = $qb->getQuery()->getResult();
         echo count($notPaidOrders)." not paid orders found from before ".$paymentTarget->format('d.m.Y').".".PHP_EOL;
@@ -454,18 +470,21 @@ public function sendPaymentReminderAction() {
 
         foreach($notPaidOrders as $order) {
             # prepare email (participant, buyer)
-            #$emailService = new Service\EmailService();
             $emailService = $this->getServiceLocator()
                     ->get('ErsBase\Service\EmailService');
             $config = $this->getServiceLocator()
                     ->get('config');
             $emailService->setFrom($config['ERS']['info_mail']);
 
+            /*** real buyer ***/
             $buyer = $order->getBuyer();
             $emailService->addTo($buyer);
-            /*$user = new Entity\User();
-            $user->setEmail('[email protected]');
-            $emailService->addTo($user);*/
+            /***/
+            /*** test buyer **
+            $user = new Entity\User();
+            $user->setEmail('andi'.$order->getCode()->getValue().'@inbaz.org');
+            $emailService->addTo($user);
+            /***/
 
             $bcc = new Entity\User();
             $bcc->setEmail($config['ERS']['info_mail']);
@@ -485,6 +504,10 @@ public function sendPaymentReminderAction() {
 
             $emailService->send();
 
+            $order->setPaymentReminderStatus($order->getPaymentReminderStatus()+1);
+            $em->persist($order);
+            $em->flush();
+
             echo "sent payment reminder for order ".$order->getCode()->getValue().PHP_EOL;
         }
     }

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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

diff --git a/module/ErsBase/src/ErsBase/Entity/Base/BankAccount.php b/module/ErsBase/src/ErsBase/Entity/Base/BankAccount.php
@@ -2,7 +2,7 @@
 
 /**
  * Auto generated by MySQL Workbench Schema Exporter.
- * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */
@@ -63,6 +63,11 @@ class Order
      */
     protected $payment_status;
 
+    /**
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    protected $payment_reminder_status;
+
     /**
      * @ORM\Column(type="float", nullable=true)
      */
@@ -347,6 +352,29 @@ public function getPaymentStatus()
         return $this->payment_status;
     }
 
+    /**
+     * Set the value of payment_reminder_status.
+     *
+     * @param integer $payment_reminder_status
+     * @return \ErsBase\Entity\Base\Order
+     */
+    public function setPaymentReminderStatus($payment_reminder_status)
+    {
+        $this->payment_reminder_status = $payment_reminder_status;
+
+        return $this;
+    }
+
+    /**
+     * Get the value of payment_reminder_status.
+     *
+     * @return integer
+     */
+    public function getPaymentReminderStatus()
+    {
+        return $this->payment_reminder_status;
+    }
+
     /**
      * Set the value of order_sum.
      *
@@ -728,7 +756,7 @@ public function populate(array $data = array())
      */
     public function getArrayCopy(array $fields = array())
     {
-        $dataFields = array('id', 'code_id', 'status_id', 'buyer_id', 'payment_type_id', 'hashkey', 'invoice_detail', 'payment_status', 'order_sum', 'total_sum', 'refund_sum', 'updated', 'created');
+        $dataFields = array('id', 'code_id', 'status_id', 'buyer_id', 'payment_type_id', 'hashkey', 'invoice_detail', 'payment_status', 'payment_reminder_status', 'order_sum', 'total_sum', 'refund_sum', 'updated', 'created');
         $relationFields = array('user', 'paymentType', 'status', 'code');
         $copiedFields = array();
         foreach ($relationFields as $relationField) {
@@ -761,6 +789,6 @@ public function getArrayCopy(array $fields = array())
 
     public function __sleep()
     {
-        return array('id', 'code_id', 'status_id', 'buyer_id', 'payment_type_id', 'hashkey', 'invoice_detail', 'payment_status', 'order_sum', 'total_sum', 'refund_sum', 'updated', 'created');
+        return array('id', 'code_id', 'status_id', 'buyer_id', 'payment_type_id', 'hashkey', 'invoice_detail', 'payment_status', 'payment_reminder_status', 'order_sum', 'total_sum', 'refund_sum', 'updated', 'created');
     }
 }
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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:27.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */

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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * 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 2016-06-07 09:27:21.
+ * Version 2.1.6-dev (doctrine2-mappedsuperclass) on 2016-10-25 09:20:28.
  * Goto https://github.com/johmue/mysql-workbench-schema-exporter for more
  * information.
  */