price matrix problem fixed

BigAndini · Mar 6, 2015 · bc77aec · bc77aec
1 parent 075a87d
commit bc77aec
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/module/Admin/view/partial/price-matrix.phtml b/module/Admin/view/partial/price-matrix.phtml
@@ -58,6 +58,7 @@
     <?php endforeach; ?>
     <td>
     <?php if(
+        $price != null &&
         $price->getAgegroup() == null && 
         $price->getDeadline() == null): ?>
         <?php echo $this->currencyFormat($price->getCharge(), 'EUR', null, 'de_DE'); ?>

diff --git a/module/PreReg/src/PreReg/Form/PaymentType.php b/module/PreReg/src/PreReg/Form/PaymentType.php
@@ -32,7 +32,7 @@ public function __construct($name = null)
                 'class' => 'checkbox-inline',
             ), 
             'options' => array( 
-                'label' => 'Choose Paymenttype', 
+                'label' => 'Choose Payment type', 
             ), 
         ));
 
@@ -45,7 +45,7 @@ public function __construct($name = null)
             'name' => 'submit',
             'attributes' => array(
                 'type'  => 'submit',
-                'value' => 'Save PaymentType',
+                'value' => 'Save Payment type',
                 'id' => 'submitbutton',
                 'class' => 'btn btn-primary btn-lg',
             ),

diff --git a/module/PreReg/view/pre-reg/order/payment.phtml b/module/PreReg/view/pre-reg/order/payment.phtml
@@ -24,7 +24,7 @@ echo $this->navigation()
     <?php echo $this->formSubmit($form->get('submit')); ?>
 </div>
 <div>
-    <h1>Choose Paymenttype</h1>
+    <h1>Choose Payment type</h1>
     <?php foreach($paymenttypes as $paymenttype): ?>
     <?php if($order->getPaymentType() != null && $order->getPaymentType()->getId() == $paymenttype->getId()) :
             $checked = true;

diff --git a/module/PreReg/view/pre-reg/participant/add.phtml b/module/PreReg/view/pre-reg/participant/add.phtml
@@ -1,7 +1,7 @@
 <?php
 // module/Album/view/album/album/add.phtml:
 
-$title = 'Add Participant';
+$title = 'Add Person';
 $this->headTitle($title);
 ?>
 <h1><?php echo $this->escapeHtml($title); ?></h1>

diff --git a/module/PreReg/view/pre-reg/participant/delete.phtml b/module/PreReg/view/pre-reg/participant/delete.phtml
@@ -1,6 +1,6 @@
 <?php
 
-$title = 'Delete Participant';
+$title = 'Delete Person';
 $this->headTitle($title);
 ?>
 <h1><?php echo $this->escapeHtml($title); ?></h1>

diff --git a/module/PreReg/view/pre-reg/participant/edit.phtml b/module/PreReg/view/pre-reg/participant/edit.phtml
@@ -1,6 +1,6 @@
 <?php
 
-$title = 'Edit Participant';
+$title = 'Edit Person';
 $this->headTitle($title);
 ?>
 <h1><?php echo $this->escapeHtml($title); ?></h1>