From cccb2b6f2d67ea247554baa67eae5920b7185a22 Mon Sep 17 00:00:00 2001
From: Andi Nitsche <andi@inbaz.org>
Date: Sat, 30 Dec 2017 08:07:30 +0100
Subject: [PATCH] changed 2017 to 2018 with setting entries

---
 module/PreReg/src/PreReg/Form/CreditCard.php              | 4 ++--
 module/PreReg/view/partial/eticket-package-overview.phtml | 6 +++---
 module/PreReg/view/pre-reg/info/help.phtml                | 3 ++-
 module/PreReg/view/pre-reg/order/thankyou.phtml           | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/module/PreReg/src/PreReg/Form/CreditCard.php b/module/PreReg/src/PreReg/Form/CreditCard.php
index d0e6dd6b..4b75febc 100644
--- a/module/PreReg/src/PreReg/Form/CreditCard.php
+++ b/module/PreReg/src/PreReg/Form/CreditCard.php
@@ -264,12 +264,12 @@ public function __construct()
                     'class'  => '',
                 ),*/
                 'option_values' => array(
-                    '2017' => '2017',
                     '2018' => '2018',
                     '2019' => '2019',
                     '2020' => '2020',
                     '2021' => '2021',
                     '2022' => '2022',
+                    '2023' => '2023',
                 ),
             ), 
         ));
@@ -366,4 +366,4 @@ public function getInputFilter()
         
         return $this->inputFilter; 
     }
-}
\ No newline at end of file
+}
diff --git a/module/PreReg/view/partial/eticket-package-overview.phtml b/module/PreReg/view/partial/eticket-package-overview.phtml
index dcc6ebd5..2fff4d17 100644
--- a/module/PreReg/view/partial/eticket-package-overview.phtml
+++ b/module/PreReg/view/partial/eticket-package-overview.phtml
@@ -110,7 +110,7 @@
                                         '',
                                         '',
                                     ];
-                                    $datestring = preg_replace($pattern, $replace, $value->getValue()).' 2017';
+                                    $datestring = preg_replace($pattern, $replace, $value->getValue()).' '.$this->setting('ers.year');
                                     $timestamp = strtotime($datestring);
                                     $date = new DateTime();
                                     $date->setTimestamp($timestamp); 
@@ -134,7 +134,7 @@
                                         '',
                                         '',
                                     ];
-                                    $datestring = preg_replace($pattern, $replace, $value->getValue()).' 2017';
+                                    $datestring = preg_replace($pattern, $replace, $value->getValue()).' '.$this->setting('ers.year');
                                     $timestamp = strtotime($datestring);
                                     $date = new DateTime();
                                     $date->setTimestamp($timestamp); ?>
@@ -203,4 +203,4 @@
                     <?php break;
             endswitch; ?>
     <?php endforeach; ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/module/PreReg/view/pre-reg/info/help.phtml b/module/PreReg/view/pre-reg/info/help.phtml
index 51f87401..6894f71f 100644
--- a/module/PreReg/view/pre-reg/info/help.phtml
+++ b/module/PreReg/view/pre-reg/info/help.phtml
@@ -38,7 +38,8 @@
             we will have to cancel your order. Sorry. To avoid that, best pay 
             immediately!<br>
             If you have already paid your order and received your e-ticket, but 
-            for some reasons cannot attend EJC 2017, the best thing to do is
+            for some reasons cannot attend 
+            <?php $this->setting('ers.name_short'); ?>, the best thing to do is
             find another juggler who can take over your ticket. When you have 
             done that, it is very important that you let us know who the ticket 
             shall be transferred! Please contact  
diff --git a/module/PreReg/view/pre-reg/order/thankyou.phtml b/module/PreReg/view/pre-reg/order/thankyou.phtml
index 664ab350..646c0e69 100644
--- a/module/PreReg/view/pre-reg/order/thankyou.phtml
+++ b/module/PreReg/view/pre-reg/order/thankyou.phtml
@@ -7,7 +7,7 @@ $this->headTitle($title);
 <div class="jumbotron">
     <h1><span class="green"><?php echo $this->escapeHtml($title); ?></span></h1>
     
-    <p><?php echo $this->translate('...for your purchase and with that for your support to make the EJC 2017 possible.'); ?></p>
+    <p><?php echo sprintf($this->translate('...for your purchase and with that for your support to make the %s possible.'), $this->setting('ers.name_short')); ?></p>
     
     <p><strong><?php echo $this->translate('Note:'); ?></strong> <?php echo sprintf($this->translate('To receive the email with your E-Tickets correctly 
         it\'s important that you add the email address %s to your