@@ -29,16 +29,16 @@ discard block |
||
| 29 | 29 | $method_data = array(); |
| 30 | 30 | $quote_data = array(); |
| 31 | 31 | |
| 32 | - for ($i=1;$i<=12;$i++) { |
|
| 32 | + for ($i = 1; $i <= 12; $i++) { |
|
| 33 | 33 | $query = $this->db->query(" |
| 34 | 34 | SELECT * |
| 35 | 35 | FROM zone_to_geo_zone |
| 36 | - WHERE geo_zone_id = '" . (int)$this->config->get('xshipping_geo_zone_id'.$i) . "' |
|
| 36 | + WHERE geo_zone_id = '" . (int)$this->config->get('xshipping_geo_zone_id' . $i) . "' |
|
| 37 | 37 | AND country_id = '" . (int)$address['country_id'] . "' |
| 38 | 38 | AND (zone_id = '" . (int)$address['zone_id'] . "' OR zone_id = '0') |
| 39 | 39 | "); |
| 40 | 40 | |
| 41 | - if (!$this->config->get('xshipping_geo_zone_id'.$i)) { |
|
| 41 | + if (!$this->config->get('xshipping_geo_zone_id' . $i)) { |
|
| 42 | 42 | $status = true; |
| 43 | 43 | } elseif ($query->num_rows) { |
| 44 | 44 | $status = true; |
@@ -46,28 +46,28 @@ discard block |
||
| 46 | 46 | $status = false; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - if (!$this->config->get('xshipping_status'.$i)) { |
|
| 49 | + if (!$this->config->get('xshipping_status' . $i)) { |
|
| 50 | 50 | $status = false; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - if (!$this->config->get('xshipping_name'.$i)) { |
|
| 53 | + if (!$this->config->get('xshipping_name' . $i)) { |
|
| 54 | 54 | $status = false; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - $shipping_cost=$this->config->get('xshipping_cost'.$i); |
|
| 58 | - $free_shipping_cost=(float)$this->config->get('xshipping_free'.$i); |
|
| 57 | + $shipping_cost = $this->config->get('xshipping_cost' . $i); |
|
| 58 | + $free_shipping_cost = (float)$this->config->get('xshipping_free' . $i); |
|
| 59 | 59 | if (empty($free_shipping_cost)) { |
| 60 | - $free_shipping_cost=0; |
|
| 60 | + $free_shipping_cost = 0; |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - if ($this->cart->getSubTotal() >= $free_shipping_cost && $free_shipping_cost!=0) { |
|
| 63 | + if ($this->cart->getSubTotal() >= $free_shipping_cost && $free_shipping_cost != 0) { |
|
| 64 | 64 | $shipping_cost = 0; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | if ($status) { |
| 68 | - $quote_data['xshipping'.$i] = array( |
|
| 69 | - 'code' => 'xshipping'.'.xshipping'.$i, |
|
| 70 | - 'title' => $this->config->get('xshipping_name'.$i), |
|
| 68 | + $quote_data['xshipping' . $i] = array( |
|
| 69 | + 'code' => 'xshipping' . '.xshipping' . $i, |
|
| 70 | + 'title' => $this->config->get('xshipping_name' . $i), |
|
| 71 | 71 | 'cost' => $shipping_cost, |
| 72 | 72 | 'text' => $this->currency->format($shipping_cost, $this->session->data['currency']) |
| 73 | 73 | ); |
@@ -29,8 +29,8 @@ discard block |
||
| 29 | 29 | SELECT DISTINCT * |
| 30 | 30 | FROM information i |
| 31 | 31 | LEFT JOIN information_description id ON (i.information_id = id.information_id) |
| 32 | - WHERE i.information_id = '" . (int) $information_id . "' |
|
| 33 | - AND id.language_id = '" . (int) $this->config->get('config_language_id') . "' |
|
| 32 | + WHERE i.information_id = '" . (int)$information_id . "' |
|
| 33 | + AND id.language_id = '" . (int)$this->config->get('config_language_id') . "' |
|
| 34 | 34 | AND i.status = '1' |
| 35 | 35 | "); |
| 36 | 36 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | SELECT * |
| 63 | 63 | FROM information i |
| 64 | 64 | LEFT JOIN information_description id ON (i.information_id = id.information_id) |
| 65 | - WHERE id.language_id = '" . (int) $this->config->get('config_language_id') . "' |
|
| 65 | + WHERE id.language_id = '" . (int)$this->config->get('config_language_id') . "' |
|
| 66 | 66 | AND i.status = '1' |
| 67 | 67 | ORDER BY i.sort_order, |
| 68 | 68 | LCASE(id.title) ASC |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $query = $this->db->query(" |
| 77 | 77 | SELECT * |
| 78 | 78 | FROM information_to_layout |
| 79 | - WHERE information_id = '" . (int) $information_id . "' |
|
| 79 | + WHERE information_id = '" . (int)$information_id . "' |
|
| 80 | 80 | "); |
| 81 | 81 | |
| 82 | 82 | if ($query->num_rows) { |
@@ -4,22 +4,22 @@ |
||
| 4 | 4 | |
| 5 | 5 | // Text |
| 6 | 6 | $_['text_cart'] = 'Shopping Cart'; |
| 7 | -$_['text_customer'] = 'Customer'; |
|
| 8 | -$_['text_full_name'] = 'Full name'; |
|
| 7 | +$_['text_customer'] = 'Customer'; |
|
| 8 | +$_['text_full_name'] = 'Full name'; |
|
| 9 | 9 | |
| 10 | -$_['text_telephone'] = 'Telephone'; |
|
| 11 | -$_['text_email'] = 'E-Mail'; |
|
| 12 | -$_['text_town'] = 'City'; |
|
| 10 | +$_['text_telephone'] = 'Telephone'; |
|
| 11 | +$_['text_email'] = 'E-Mail'; |
|
| 12 | +$_['text_town'] = 'City'; |
|
| 13 | 13 | $_['text_delivery_method'] = 'Delivery method'; |
| 14 | 14 | $_['text_delivery_type_1'] = 'To post office'; |
| 15 | 15 | $_['text_delivery_type_2'] = 'To address'; |
| 16 | -$_['text_delivery_placeholder'] = '№ of post office / delivery address'; |
|
| 17 | -$_['text_payment_method'] = 'Payment method'; |
|
| 16 | +$_['text_delivery_placeholder'] = '№ of post office / delivery address'; |
|
| 17 | +$_['text_payment_method'] = 'Payment method'; |
|
| 18 | 18 | $_['text_comment'] = 'Comment'; |
| 19 | 19 | $_['text_confirm'] = 'Confirm order'; |
| 20 | 20 | $_['text_product'] = 'Product name'; |
| 21 | 21 | $_['text_price'] = 'Price'; |
| 22 | -$_['text_quantity'] = 'Quantity'; |
|
| 22 | +$_['text_quantity'] = 'Quantity'; |
|
| 23 | 23 | $_['text_total'] = 'Total'; |
| 24 | 24 | |
| 25 | 25 | $_['text_notlogged'] = 'You haven\'t logged in. If you have account, please <span class="login-modal-link" data-toggle="modal" data-target="#LoginModal" >log in</span> before placing the order'; |
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | $_['entry_country'] = 'Country'; |
| 86 | 86 | $_['entry_zone'] = 'Region / State'; |
| 87 | 87 | $_['entry_newsletter'] = 'I wish to subscribe to the %s newsletter.'; |
| 88 | -$_['entry_shipping'] = 'My delivery and billing addresses are the same.'; |
|
| 88 | +$_['entry_shipping'] = 'My delivery and billing addresses are the same.'; |
|
| 89 | 89 | |
| 90 | 90 | // Error |
| 91 | 91 | $_['error_warning'] = 'There was a problem while trying to process your order! If the problem persists please try selecting a different payment method or you can contact the store owner by <a href="%s">clicking here</a>.'; |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
| 22 | 22 | |
| 23 | 23 | // Heading |
| 24 | -$_['heading_title'] = 'Your Order #%s Has Been Placed!'; |
|
| 24 | +$_['heading_title'] = 'Your Order #%s Has Been Placed!'; |
|
| 25 | 25 | $_['heading_title_customer'] = 'Your Order #%s Has Been Placed!'; |
| 26 | 26 | |
| 27 | 27 | // Text |
@@ -39,8 +39,8 @@ |
||
| 39 | 39 | $_['text_year'] = 'year'; |
| 40 | 40 | $_['text_trial'] = '%s every %s %s for %s payments then '; |
| 41 | 41 | $_['text_length'] = ' for %s payments'; |
| 42 | -$_['text_until_cancelled'] = 'until cancelled'; |
|
| 43 | -$_['text_trial_description'] = '%s every %d %s(s) for %d payment(s) then'; |
|
| 42 | +$_['text_until_cancelled'] = 'until cancelled'; |
|
| 43 | +$_['text_trial_description'] = '%s every %d %s(s) for %d payment(s) then'; |
|
| 44 | 44 | $_['text_payment_description'] = '%s every %d %s(s) for %d payment(s)'; |
| 45 | 45 | $_['text_payment_until_canceled_description'] = '%s every %d %s(s) until canceled'; |
| 46 | 46 | |
@@ -36,13 +36,13 @@ |
||
| 36 | 36 | $_['text_sort_name'] = 'name'; |
| 37 | 37 | $_['text_sort_rated'] = 'rated'; |
| 38 | 38 | $_['text_sort_viewed'] = 'viewed'; |
| 39 | -$_['text_views'] = 'Views:'; |
|
| 39 | +$_['text_views'] = 'Views:'; |
|
| 40 | 40 | $_['text_date_asc'] = 'Date (Lowest)'; |
| 41 | 41 | $_['text_date_desc'] = 'Date (Highest)'; |
| 42 | -$_['text_viewed_asc'] = 'Viewed (Lowest)'; |
|
| 42 | +$_['text_viewed_asc'] = 'Viewed (Lowest)'; |
|
| 43 | 43 | $_['text_viewed_desc'] = 'Viewed (Highest)'; |
| 44 | -$_['text_name_asc'] = 'Name (A - Z)'; |
|
| 44 | +$_['text_name_asc'] = 'Name (A - Z)'; |
|
| 45 | 45 | $_['text_name_desc'] = 'Name (Z - A)'; |
| 46 | 46 | $_['text_default'] = 'Default'; |
| 47 | 47 | |
| 48 | -$_['button_more'] = 'more'; |
|
| 48 | +$_['button_more'] = 'more'; |
|
@@ -24,5 +24,5 @@ |
||
| 24 | 24 | $_['text_subject'] = '%s - Article Review'; |
| 25 | 25 | $_['text_waiting'] = 'You have a new article review waiting.'; |
| 26 | 26 | $_['text_article'] = 'Article: %s'; |
| 27 | -$_['text_reviewer'] = 'Reviewer: %s'; |
|
| 28 | -$_['text_review'] = 'Review Text:'; |
|
| 27 | +$_['text_reviewer'] = 'Reviewer: %s'; |
|
| 28 | +$_['text_review'] = 'Review Text:'; |
|
@@ -31,10 +31,10 @@ |
||
| 31 | 31 | $_['text_wait'] = 'Please Wait!'; |
| 32 | 32 | $_['text_reviews'] = '%s reviews'; |
| 33 | 33 | $_['text_error'] = 'Article not found!'; |
| 34 | -$_['text_views'] = 'Views:'; |
|
| 34 | +$_['text_views'] = 'Views:'; |
|
| 35 | 35 | $_['button_more'] = 'more'; |
| 36 | -$_['text_related'] = 'Related Articles'; |
|
| 37 | -$_['text_related_product'] = 'Related Products'; |
|
| 36 | +$_['text_related'] = 'Related Articles'; |
|
| 37 | +$_['text_related_product'] = 'Related Products'; |
|
| 38 | 38 | |
| 39 | 39 | // Entry |
| 40 | 40 | $_['entry_name'] = 'Your Name:'; |