@@ -24,7 +24,7 @@ |
||
24 | 24 | |
25 | 25 | $this->hasOne( |
26 | 26 | 'Intraface_modules_product_Attribute_Group as attribute_group', |
27 | - array('local' => 'product_attribute_group_id','foreign' => 'id') |
|
27 | + array('local' => 'product_attribute_group_id', 'foreign' => 'id') |
|
28 | 28 | ); |
29 | 29 | } |
30 | 30 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | |
35 | 35 | $data = array('product' => $product, 'groups' => $groups); |
36 | 36 | |
37 | - $smarty = $this->template->create(dirname(__FILE__) . '/tpl/productattributegroup'); |
|
37 | + $smarty = $this->template->create(dirname(__FILE__).'/tpl/productattributegroup'); |
|
38 | 38 | return $smarty->render($this, $data); |
39 | 39 | } |
40 | 40 |
@@ -92,7 +92,7 @@ |
||
92 | 92 | |
93 | 93 | $data = array('products' => $list); |
94 | 94 | |
95 | - $smarty = $this->template->create(dirname(__FILE__) . '/tpl/selectproduct'); |
|
95 | + $smarty = $this->template->create(dirname(__FILE__).'/tpl/selectproduct'); |
|
96 | 96 | return $smarty->render($this, $data); |
97 | 97 | } |
98 | 98 |
@@ -12,9 +12,12 @@ discard block |
||
12 | 12 | |
13 | 13 | <?php if (count($groups) == 0) : ?> |
14 | 14 | <p><?php e(t('No attribute groups has been selected.')); ?> <a href="<?php e(url('select_attribute_group')); ?>"><?php e(t('Choose attribute groups')); ?></a>.</p> |
15 | -<?php else : ?> |
|
15 | +<?php else { |
|
16 | + : ?> |
|
16 | 17 | |
17 | -<form action="<?php e(url(null, array($context->subview()))); ?>" method="post"> |
|
18 | +<form action="<?php e(url(null, array($context->subview()))); |
|
19 | +} |
|
20 | +?>" method="post"> |
|
18 | 21 | <input type="hidden" name="id" value="<?php e($product->getId()); ?>" /> |
19 | 22 | <table summary="<?php e(t('Variations')); ?>" id="variations_table" class="stripe"> |
20 | 23 | <caption><?php e(t('Variations')); ?></caption> |
@@ -70,8 +73,10 @@ discard block |
||
70 | 73 | </td> |
71 | 74 | <td><?php if ($variation !== null) : |
72 | 75 | e($variation->getNumber()); |
73 | -else : |
|
76 | +else { |
|
77 | + : |
|
74 | 78 | e('-'); |
79 | +} |
|
75 | 80 | endif; ?> |
76 | 81 | </td> |
77 | 82 | <td> |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <div id="colOne"> |
2 | 2 | |
3 | 3 | <div class="box"> |
4 | - <h2><?php e(t('Product')); ?> #<?php e($product->get('number')); ?> <?php e($product->get('name')); ?></h2> |
|
5 | - <h2><?php e(t('Variation')); ?> #<?php e($variation->getNumber()); ?> <?php e($variation->getName()); ?></h2> |
|
4 | + <h2><?php e(t('Product')); ?> #<?php e($product->get('number')); ?> <?php e($product->get('name')); ?></h2> |
|
5 | + <h2><?php e(t('Variation')); ?> #<?php e($variation->getNumber()); ?> <?php e($variation->getName()); ?></h2> |
|
6 | 6 | <ul class="options"> |
7 | 7 | <li><a href="<?php e(url('../../')); ?>"><?php e(t('close')); ?></a></li> |
8 | 8 | </ul> |
@@ -13,9 +13,12 @@ |
||
13 | 13 | |
14 | 14 | <?php if ($groups->count() == 0) : ?> |
15 | 15 | <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> |
16 | -<?php else : ?> |
|
16 | +<?php else { |
|
17 | + : ?> |
|
17 | 18 | |
18 | -<form action="<?php e(url()); ?>" method="post"> |
|
19 | +<form action="<?php e(url()); |
|
20 | +} |
|
21 | +?>" method="post"> |
|
19 | 22 | <table summary="<?php e(t('Attribute groups')); ?>" id="attribute_group_table" class="stripe"> |
20 | 23 | <caption><?php e(t('Attribute groups')); ?></caption> |
21 | 24 | <thead> |
@@ -18,9 +18,12 @@ |
||
18 | 18 | |
19 | 19 | <?php if (count($attributes) == 0) : ?> |
20 | 20 | <p><?php e(t('No attributes has been created.')); ?> <a href="attribute_edit.php?group_id=<?php e($group->getId()); ?>"><?php e(t('Create attribute')); ?></a>.</p> |
21 | -<?php else : ?> |
|
21 | +<?php else { |
|
22 | + : ?> |
|
22 | 23 | |
23 | -<form action="<?php e(url()); ?>" method="post"> |
|
24 | +<form action="<?php e(url()); |
|
25 | +} |
|
26 | +?>" method="post"> |
|
24 | 27 | <input type="hidden" name="id" value="<?php e($group->getId()); ?>" /> |
25 | 28 | <table summary="<?php e(t('Attributes')); ?>" id="attribute_table" class="stripe"> |
26 | 29 | <caption><?php e(t('Attributes')); ?></caption> |
@@ -11,9 +11,12 @@ |
||
11 | 11 | |
12 | 12 | <?php if ($groups->count() == 0) : ?> |
13 | 13 | <p><?php e(t('No attribute groups has been created.')); ?> <a href="attribute_group_edit.php"><?php e(t('Create attribute group')); ?></a>.</p> |
14 | -<?php else : ?> |
|
14 | +<?php else { |
|
15 | + : ?> |
|
15 | 16 | |
16 | -<form action="<?php e(url()); ?>" method="post"> |
|
17 | +<form action="<?php e(url()); |
|
18 | +} |
|
19 | +?>" method="post"> |
|
17 | 20 | <input type="hidden" name="id" value="<?php e($product->getId()); ?>" /> |
18 | 21 | <table summary="<?php e(t('Attribute groups')); ?>" id="attribute_group_table" class="stripe"> |
19 | 22 | <caption><?php e(t('Attribute groups')); ?></caption> |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <div id="colOne"> |
2 | 2 | |
3 | 3 | <div class="box"> |
4 | - <h2>#<?php e($product->get('number')); ?> <?php e($product->get('name')); ?></h2> |
|
4 | + <h2>#<?php e($product->get('number')); ?> <?php e($product->get('name')); ?></h2> |
|
5 | 5 | <ul class="options"> |
6 | 6 | <?php if ($product->get('locked') != 1) { ?> |
7 | 7 | <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('Edit')); ?></a></li> |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | <td> |
40 | 40 | <?php |
41 | 41 | // getting settings |
42 | - $unit_choises = Product::getUnits(); |
|
42 | + $unit_choises = Product::getUnits(); |
|
43 | 43 | e(t($unit_choises[$product->get('unit_id')]['combined'])); |
44 | 44 | ?> |
45 | 45 | </td> |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } else { |
94 | 94 | $account = Account::factory($year, $product->get('state_account_id')); |
95 | 95 | if ($account->get('name')) { |
96 | - e($account->get('number') . ' ' . $account->get('name')); |
|
96 | + e($account->get('number').' '.$account->get('name')); |
|
97 | 97 | } else { |
98 | 98 | echo t('Not set'); |
99 | 99 | } |
@@ -165,10 +165,10 @@ discard block |
||
165 | 165 | <td><?php e($variation->getNumber()); ?></td> |
166 | 166 | <td><?php e($variation->getName()); ?></td> |
167 | 167 | <td><?php e($variation->getDetail()->getPrice($product)->getAsLocal('da_dk', 2)); ?> </td> |
168 | - <td><?php e($product->get('weight')+$variation->getDetail()->getWeightDifference()); ?></td> |
|
168 | + <td><?php e($product->get('weight') + $variation->getDetail()->getWeightDifference()); ?></td> |
|
169 | 169 | <?php if ($kernel->user->hasModuleAccess("stock") and $product->get('stock')) : ?> |
170 | 170 | <td><?php e($variation->getStock($product)->get('actual_stock')); ?></td> |
171 | - <td><a href="<?php e(url('variation/' . $variation->getId())); ?>"><?php e(t('Details')); ?></a></td> |
|
171 | + <td><a href="<?php e(url('variation/'.$variation->getId())); ?>"><?php e(t('Details')); ?></a></td> |
|
172 | 172 | <?php endif; ?> |
173 | 173 | |
174 | 174 | </tr> |
@@ -197,9 +197,9 @@ discard block |
||
197 | 197 | $related = $product->getRelatedProducts(); |
198 | 198 | if (!empty($related) and count($related) > 0) { |
199 | 199 | foreach ($related as $p) { |
200 | - echo '<li>'. $p['name']; |
|
200 | + echo '<li>'.$p['name']; |
|
201 | 201 | if ($p['locked'] == 0) { |
202 | - echo ' <a class="delete" href="'.url('related', array('delete', 'del_related' => $p['related_id'])) .'">'.t('remove').'</a>'; |
|
202 | + echo ' <a class="delete" href="'.url('related', array('delete', 'del_related' => $p['related_id'])).'">'.t('remove').'</a>'; |
|
203 | 203 | } |
204 | 204 | echo '</li>'; |
205 | 205 | } |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | <?php $category_type = new Intraface_Category_Type('shop', $shop->getId()); ?> |
255 | 255 | <h3><?php e($shop->getName()); ?></h3> |
256 | 256 | <ul class="options"> |
257 | - <li><a href="<?php e(url('shop/'. $shop->getId() . '/categories/', array('product_id' => $product->getId()))); ?>"><?php e(t('Add product to categories')); ?></a></li> |
|
257 | + <li><a href="<?php e(url('shop/'.$shop->getId().'/categories/', array('product_id' => $product->getId()))); ?>"><?php e(t('Add product to categories')); ?></a></li> |
|
258 | 258 | </ul> |
259 | 259 | <?php |
260 | 260 | $category = new Intraface_Category($kernel, $db, $category_type); |
@@ -128,10 +128,12 @@ discard block |
||
128 | 128 | <ul class="options"> |
129 | 129 | <li><a href="<?php e(url('variations/select_attribute_groups')); ?>"><?php e(t('Select attributes for product')); ?></a></li> |
130 | 130 | </ul> |
131 | - <?php else : ?> |
|
131 | + <?php else { |
|
132 | + : ?> |
|
132 | 133 | <?php |
133 | 134 | try { |
134 | 135 | $variations = $product->getVariations(); |
136 | +} |
|
135 | 137 | $variation_is_present = true; |
136 | 138 | } catch (Intraface_Gateway_Exception $e) { |
137 | 139 | $variation_is_present = false; |
@@ -142,9 +144,12 @@ discard block |
||
142 | 144 | <ul class="options"> |
143 | 145 | <li><a href="<?php e(url('variations', array('edit'))); ?>"><?php e(t('Create variations for the product')); ?></a></li> |
144 | 146 | </ul> |
145 | - <?php else : ?> |
|
147 | + <?php else { |
|
148 | + : ?> |
|
146 | 149 | |
147 | - <table summary="<?php e(t('Variations')); ?>" id="variations_table" class="stripe"> |
|
150 | + <table summary="<?php e(t('Variations')); |
|
151 | +} |
|
152 | +?>" id="variations_table" class="stripe"> |
|
148 | 153 | <caption><?php e(t('Variations')); ?></caption> |
149 | 154 | <thead> |
150 | 155 | <tr> |