Completed
Pull Request — master (#26)
by Lars
10:03
created
Intraface/modules/product/Controller/tpl/select-attribute-groups.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,8 +15,11 @@
 block discarded – undo
15 15
 
16 16
 <?php if ($groups->count() == 0) : ?>
17 17
     <p><?php e(t('No attribute groups has been created.')); ?> <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create attribute group')); ?></a>.</p>
18
-<?php else : ?>
18
+<?php else {
19
+    : ?>
19 20
 
20
-    <?php echo $content; ?>
21
+    <?php echo $content;
22
+}
23
+?>
21 24
 
22 25
 <?php endif; ?>
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/tpl/variations.tpl.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,8 +54,10 @@
 block discarded – undo
54 54
                         </td>
55 55
                         <td><?php if ($variation !== null) :
56 56
                             e($variation->getNumber());
57
-else :
57
+else {
58
+    :
58 59
     e('-');
60
+}
59 61
 endif; ?>
60 62
                         </td>
61 63
                         <td>
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/tpl/show-plain-text.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
     </tr>
7 7
     <tr>
8 8
         <td><?php e(t('Number')); ?></td>
9
-        <td><?php e($product->get('number'));  ?></td>
9
+        <td><?php e($product->get('number')); ?></td>
10 10
     </tr>
11 11
     <tr>
12 12
         <td><?php e(t('Name')); ?></td>
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
                     <td><?php e($variation->getNumber()); ?></td>
88 88
                     <td><?php e($variation->getName()); ?></td>
89 89
                     <td><?php e($variation->getDetail()->getPrice($product)->getAsLocal('da_dk', 2)); ?> </td>
90
-                    <td><?php e($product->get('weight')+$variation->getDetail()->getWeightDifference()); ?></td>
90
+                    <td><?php e($product->get('weight') + $variation->getDetail()->getWeightDifference()); ?></td>
91 91
                     <?php if ($kernel->user->hasModuleAccess("stock") and $product->get('stock')) : ?>
92 92
                         <td><?php e($variation->getStock($product)->get('actual_stock')); ?></td>
93 93
                     <?php endif; ?>
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/tpl/selectproductvariation.tpl.php 1 patch
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,8 +6,11 @@  discard block
 block discarded – undo
6 6
 
7 7
 <?php if (count($variations) == 0) : ?>
8 8
     <p><?php e(t('No variations created for the product')); ?>.</p>
9
-<?php else : ?>
10
-    <form action="<?php e(url(null)); ?>" method="post">
9
+<?php else {
10
+    : ?>
11
+    <form action="<?php e(url(null));
12
+}
13
+?>" method="post">
11 14
         <input type="hidden" name="product_id" value="<?php e($product->getId()); ?>" />
12 15
         <input type="hidden" name="set_quantity" value="<?php e($context->quantity); ?>" />
13 16
         <table summary="<?php e(t('Variations')); ?>" id="variations_table" class="stripe">
@@ -16,8 +19,10 @@  discard block
 block discarded – undo
16 19
                 <tr>
17 20
                     <th><?php if ($context->multiple && $context->quantity) :
18 21
                         e(t('Quantity'));
19
-else :
22
+else {
23
+    :
20 24
     echo e(t('Choose'));
25
+}
21 26
 endif; ?></th>
22 27
                     <th>#</th>
23 28
                     <th><?php e(t('Variation')); ?></th>
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/tpl/selectproduct.tpl.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
                 <tr>
66 66
                     <td>
67 67
                         <?php if ($p['has_variation']) : ?>
68
-                            <a href="<?php e(url($p['id'] . '/selectvariation', array('set_quantity' => $context->quantity, 'multiple' => $context->multiple))); ?>" /><?php echo '<img class="variation" src="/images/icons/silk/table_multiple.png" title="'.t("See the product's variations").'"/> '; ?></a>
68
+                            <a href="<?php e(url($p['id'].'/selectvariation', array('set_quantity' => $context->quantity, 'multiple' => $context->multiple))); ?>" /><?php echo '<img class="variation" src="/images/icons/silk/table_multiple.png" title="'.t("See the product's variations").'"/> '; ?></a>
69 69
                         <?php elseif ($context->multiple && $context->quantity) : ?>
70 70
                             <input id="<?php e($p['id']); ?>" type="text" name="selected[<?php e($p['id']); ?>]" value="<?php if (isset($selected_products[$p['id']])) :
71 71
                                 e($selected_products[$p['id']]);
Please login to merge, or discard this patch.
Braces   +14 added lines, -5 removed lines patch added patch discarded remove patch
@@ -7,10 +7,13 @@  discard block
 block discarded – undo
7 7
 
8 8
 <?php if ($context->getProduct()->isFilledIn() == 0) : ?>
9 9
     <p><?php e(t('No products to select.')); ?> <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create product')); ?></a>.</p>
10
-<?php else : ?>
10
+<?php else {
11
+    : ?>
11 12
 
12 13
     <ul class="options">
13
-        <li><a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a></li>
14
+        <li><a href="<?php e(url('../'));
15
+}
16
+?>"><?php e(t('Close')); ?></a></li>
14 17
         <li><a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create')); ?></a></li>
15 18
     </ul>
16 19
 
@@ -47,8 +50,10 @@  discard block
 block discarded – undo
47 50
                 <tr>
48 51
                     <th><?php if ($context->multiple && $context->quantity) :
49 52
                         e(t('Quantity'));
50
-else :
53
+else {
54
+    :
51 55
     echo e(t('Choose'));
56
+}
52 57
 endif; ?></th>
53 58
                     <th><?php e(t('Product number')); ?></th>
54 59
                     <th><?php e(t('Name')); ?></th>
@@ -69,8 +74,10 @@  discard block
 block discarded – undo
69 74
                         <?php elseif ($context->multiple && $context->quantity) : ?>
70 75
                             <input id="<?php e($p['id']); ?>" type="text" name="selected[<?php e($p['id']); ?>]" value="<?php if (isset($selected_products[$p['id']])) :
71 76
                                 e($selected_products[$p['id']]);
72
-else :
77
+else {
78
+    :
73 79
     e('0');
80
+}
74 81
 endif; ?>" size="2" />
75 82
                         <?php elseif ($context->multiple && !$context->quantity) : ?>
76 83
                             <input id="<?php e($p['id']); ?>" type="checkbox" name="selected[<?php e($p['id']); ?>]" value="1" <?php if (array_key_exists($p['id'], $selected_products)) {
@@ -95,8 +102,10 @@  discard block
 block discarded – undo
95 102
     e('...');
96 103
 elseif (isset($p['stock_status']['for_sale'])) :
97 104
     e($p['stock_status']['for_sale']);
98
-else :
105
+else {
106
+    :
99 107
     echo 0;
108
+}
100 109
 endif; ?></td>
101 110
                     <?php endif; ?>
102 111
                     <td><?php if ($p['vat'] == 1) {
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/tpl/edit.tpl.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
         $year->loadActiveYear();
153 153
 
154 154
         $account = new Account($year);
155
-        $accounts =  $account->getList('sale');
155
+        $accounts = $account->getList('sale');
156 156
 
157 157
     ?>
158 158
     <fieldset>
Please login to merge, or discard this patch.
Braces   +13 added lines, -5 removed lines patch added patch discarded remove patch
@@ -14,8 +14,10 @@  discard block
 block discarded – undo
14 14
             <label for="number"><?php e(t('Product number')); ?></label>
15 15
             <input type="text" name="number" id="number" value="<?php if (isset($product)) :
16 16
                 e($product->getDetails()->getNumber());
17
-else :
17
+else {
18
+    :
18 19
     e($context->getGateway()->getMaxNumber() + 1);
20
+}
19 21
 endif; ?>" />
20 22
         </div>
21 23
         <div class="formrow">
@@ -94,9 +96,12 @@  discard block
 block discarded – undo
94 96
                         <?php endforeach; ?>
95 97
                     </select>
96 98
                 </div>
97
-            <?php else : ?>
99
+            <?php else {
100
+    : ?>
98 101
                 <div class="formrow">
99
-                    <label for="has_variation"><?php e(t('Product has variations')); ?></label>
102
+                    <label for="has_variation"><?php e(t('Product has variations'));
103
+}
104
+?></label>
100 105
                     <input type="hidden" name="has_variation" value="<?php if (isset($product)) {
101 106
                         e($product->hasVariation());
102 107
 } ?>" />
@@ -160,10 +165,13 @@  discard block
 block discarded – undo
160 165
 
161 166
         <?php if (count($accounts) == 0) : ?>
162 167
             <p><?php e(t('You will need to create an accounting year and create accounts for that year, to be able to set the account for which this product will be stated.')); ?> <a href="<?php e($mainAccounting->getPath()); ?>"><?php e(t('Create accounting year and accounts')); ?></a></p>
163
-        <?php else : ?>
168
+        <?php else {
169
+    : ?>
164 170
 
165 171
         <div class="formrow">
166
-            <label for="state_account"><?php e(t('State on account')); ?></label>
172
+            <label for="state_account"><?php e(t('State on account'));
173
+}
174
+?></label>
167 175
             <select id="state_account" name="state_account_id">
168 176
                 <option value=""><?php e(t('Choose...')); ?></option>
169 177
                 <?php
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/Selectproductvariation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
             'product' => $product
54 54
         );
55 55
 
56
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/selectproductvariation');
56
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/selectproductvariation');
57 57
         return $smarty->render($this, $data);
58 58
     }
59 59
 
Please login to merge, or discard this patch.
src/Intraface/modules/product/Controller/AttributeGroups.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
         $data = array('groups' => $groups);
27 27
 
28
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/attributegroups');
28
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/attributegroups');
29 29
         return $smarty->render($this, $data);
30 30
     }
31 31
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     function renderHtmlCreate()
55 55
     {
56 56
         $data = array();
57
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/attributegroup-edit');
57
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/attributegroup-edit');
58 58
         return $smarty->render($this, $data);
59 59
     }
60 60
 
Please login to merge, or discard this patch.
src/Intraface/modules/language/Languages.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@
 block discarded – undo
42 42
     {
43 43
         $q = Doctrine_Query::create();
44 44
         $rows = $q->delete()
45
-          ->from('Intraface_modules_language_Languages')
46
-          ->where('intranet_id = ?', $GLOBALS['intraface_doctrine_intranet_id'])
47
-          ->execute();
45
+            ->from('Intraface_modules_language_Languages')
46
+            ->where('intranet_id = ?', $GLOBALS['intraface_doctrine_intranet_id'])
47
+            ->execute();
48 48
         return true;
49 49
     }
50 50
 }
Please login to merge, or discard this patch.