Nickbur / Sunrise-CMS

application/controller/checkout/guest.php

Indentation +353 added lines, -353 removed lines

@@ -21,364 +21,364 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 class ControllerCheckoutGuest extends \Sunrise\Core\Engine\Controller {
-	public function index() {
-		$this->load->language('checkout/checkout');
-
-		$data['text_select'] = $this->language->get('text_select');
-		$data['text_none'] = $this->language->get('text_none');
-		$data['text_your_details'] = $this->language->get('text_your_details');
-		$data['text_your_account'] = $this->language->get('text_your_account');
-		$data['text_your_address'] = $this->language->get('text_your_address');
-		$data['text_loading'] = $this->language->get('text_loading');
-
-		$data['entry_firstname'] = $this->language->get('entry_firstname');
-		$data['entry_lastname'] = $this->language->get('entry_lastname');
-		$data['entry_email'] = $this->language->get('entry_email');
-		$data['entry_telephone'] = $this->language->get('entry_telephone');
-		$data['entry_fax'] = $this->language->get('entry_fax');
-		$data['entry_company'] = $this->language->get('entry_company');
-		$data['entry_customer_group'] = $this->language->get('entry_customer_group');
-		$data['entry_address_1'] = $this->language->get('entry_address_1');
-		$data['entry_address_2'] = $this->language->get('entry_address_2');
-		$data['entry_postcode'] = $this->language->get('entry_postcode');
-		$data['entry_city'] = $this->language->get('entry_city');
-		$data['entry_country'] = $this->language->get('entry_country');
-		$data['entry_zone'] = $this->language->get('entry_zone');
-		$data['entry_shipping'] = $this->language->get('entry_shipping');
-
-		$data['button_continue'] = $this->language->get('button_continue');
-		$data['button_upload'] = $this->language->get('button_upload');
-
-		$data['customer_groups'] = array();
-
-		if (is_array($this->config->get('config_customer_group_display'))) {
-			$this->load->model('account/customer_group');
-
-			$customer_groups = $this->model_account_customer_group->getCustomerGroups();
-
-			foreach ($customer_groups as $customer_group) {
-				if (in_array($customer_group['customer_group_id'], $this->config->get('config_customer_group_display'))) {
-					$data['customer_groups'][] = $customer_group;
-				}
-			}
-		}
-
-		if (isset($this->session->data['guest']['customer_group_id'])) {
-			$data['customer_group_id'] = $this->session->data['guest']['customer_group_id'];
-		} else {
-			$data['customer_group_id'] = $this->config->get('config_customer_group_id');
-		}
-
-		if (isset($this->session->data['guest']['firstname'])) {
-			$data['firstname'] = $this->session->data['guest']['firstname'];
-		} else {
-			$data['firstname'] = '';
-		}
-
-		if (isset($this->session->data['guest']['lastname'])) {
-			$data['lastname'] = $this->session->data['guest']['lastname'];
-		} else {
-			$data['lastname'] = '';
-		}
-
-		if (isset($this->session->data['guest']['email'])) {
-			$data['email'] = $this->session->data['guest']['email'];
-		} else {
-			$data['email'] = '';
-		}
-
-		if (isset($this->session->data['guest']['telephone'])) {
-			$data['telephone'] = $this->session->data['guest']['telephone'];
-		} else {
-			$data['telephone'] = '';
-		}
-
-		if (isset($this->session->data['guest']['fax'])) {
-			$data['fax'] = $this->session->data['guest']['fax'];
-		} else {
-			$data['fax'] = '';
-		}
-
-		if (isset($this->session->data['payment_address']['company'])) {
-			$data['company'] = $this->session->data['payment_address']['company'];
-		} else {
-			$data['company'] = '';
-		}
-
-		if (isset($this->session->data['payment_address']['address_1'])) {
-			$data['address_1'] = $this->session->data['payment_address']['address_1'];
-		} else {
-			$data['address_1'] = '';
-		}
-
-		if (isset($this->session->data['payment_address']['address_2'])) {
-			$data['address_2'] = $this->session->data['payment_address']['address_2'];
-		} else {
-			$data['address_2'] = '';
-		}
-
-		if (isset($this->session->data['payment_address']['postcode'])) {
-			$data['postcode'] = $this->session->data['payment_address']['postcode'];
-		} elseif (isset($this->session->data['shipping_address']['postcode'])) {
-			$data['postcode'] = $this->session->data['shipping_address']['postcode'];
-		} else {
-			$data['postcode'] = '';
-		}
-
-		if (isset($this->session->data['payment_address']['city'])) {
-			$data['city'] = $this->session->data['payment_address']['city'];
-		} else {
-			$data['city'] = '';
-		}
-
-		if (isset($this->session->data['payment_address']['country_id'])) {
-			$data['country_id'] = $this->session->data['payment_address']['country_id'];
-		} elseif (isset($this->session->data['shipping_address']['country_id'])) {
-			$data['country_id'] = $this->session->data['shipping_address']['country_id'];
-		} else {
-			$data['country_id'] = $this->config->get('config_country_id');
-		}
-
-		if (isset($this->session->data['payment_address']['zone_id'])) {
-			$data['zone_id'] = $this->session->data['payment_address']['zone_id'];
-		} elseif (isset($this->session->data['shipping_address']['zone_id'])) {
-			$data['zone_id'] = $this->session->data['shipping_address']['zone_id'];
-		} else {
-			$data['zone_id'] = '';
-		}
-
-		$this->load->model('localisation/country');
-
-		$data['countries'] = $this->model_localisation_country->getCountries();
-
-		// Custom Fields
-		$this->load->model('account/custom_field');
-
-		$data['custom_fields'] = $this->model_account_custom_field->getCustomFields();
-
-		if (isset($this->session->data['guest']['custom_field'])) {
-			if (isset($this->session->data['guest']['custom_field'])) {
-				$guest_custom_field = $this->session->data['guest']['custom_field'];
-			} else {
-				$guest_custom_field = array();
-			}
-
-			if (isset($this->session->data['payment_address']['custom_field'])) {
-				$address_custom_field = $this->session->data['payment_address']['custom_field'];
-			} else {
-				$address_custom_field = array();
-			}
-
-			$data['guest_custom_field'] = $guest_custom_field + $address_custom_field;
-		} else {
-			$data['guest_custom_field'] = array();
-		}
-
-		$data['shipping_required'] = $this->cart->hasShipping();
-
-		if (isset($this->session->data['guest']['shipping_address'])) {
-			$data['shipping_address'] = $this->session->data['guest']['shipping_address'];
-		} else {
-			$data['shipping_address'] = true;
-		}
-
-		$this->response->setOutput($this->load->view('checkout/guest', $data));
-	}
-
-	public function save() {
-		$this->load->language('checkout/checkout');
-
-		$json = array();
-
-		// Validate if customer is logged in.
-		if ($this->customer->isLogged()) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
-
-		// Validate cart has products and has stock.
-		if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
-			$json['redirect'] = $this->url->link('checkout/cart');
-		}
-
-		// Check if guest checkout is available.
-		if (!$this->config->get('config_checkout_guest') || $this->config->get('config_customer_price') || $this->cart->hasDownload()) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
-
-		if (!$json) {
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) > 32)) {
-				$json['error']['firstname'] = $this->language->get('error_firstname');
-			}
-
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) > 32)) {
-				$json['error']['lastname'] = $this->language->get('error_lastname');
-			}
-
-			if ((\voku\helper\UTF8::strlen($this->request->post['email']) > 96) || !filter_var($this->request->post['email'], FILTER_VALIDATE_EMAIL)) {
-				$json['error']['email'] = $this->language->get('error_email');
-			}
-
-			if ((\voku\helper\UTF8::strlen($this->request->post['telephone']) < 3) || (\voku\helper\UTF8::strlen($this->request->post['telephone']) > 32)) {
-				$json['error']['telephone'] = $this->language->get('error_telephone');
-			}
-
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) < 3) || (\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) > 128)) {
-				$json['error']['address_1'] = $this->language->get('error_address_1');
-			}
-
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['city'])) < 2) || (\voku\helper\UTF8::strlen(trim($this->request->post['city'])) > 128)) {
-				$json['error']['city'] = $this->language->get('error_city');
-			}
-
-			$this->load->model('localisation/country');
-
-			$country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
-
-			if ($country_info && $country_info['postcode_required'] && (\voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) < 2 || \voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) > 10)) {
-				$json['error']['postcode'] = $this->language->get('error_postcode');
-			}
+    public function index() {
+        $this->load->language('checkout/checkout');
+
+        $data['text_select'] = $this->language->get('text_select');
+        $data['text_none'] = $this->language->get('text_none');
+        $data['text_your_details'] = $this->language->get('text_your_details');
+        $data['text_your_account'] = $this->language->get('text_your_account');
+        $data['text_your_address'] = $this->language->get('text_your_address');
+        $data['text_loading'] = $this->language->get('text_loading');
+
+        $data['entry_firstname'] = $this->language->get('entry_firstname');
+        $data['entry_lastname'] = $this->language->get('entry_lastname');
+        $data['entry_email'] = $this->language->get('entry_email');
+        $data['entry_telephone'] = $this->language->get('entry_telephone');
+        $data['entry_fax'] = $this->language->get('entry_fax');
+        $data['entry_company'] = $this->language->get('entry_company');
+        $data['entry_customer_group'] = $this->language->get('entry_customer_group');
+        $data['entry_address_1'] = $this->language->get('entry_address_1');
+        $data['entry_address_2'] = $this->language->get('entry_address_2');
+        $data['entry_postcode'] = $this->language->get('entry_postcode');
+        $data['entry_city'] = $this->language->get('entry_city');
+        $data['entry_country'] = $this->language->get('entry_country');
+        $data['entry_zone'] = $this->language->get('entry_zone');
+        $data['entry_shipping'] = $this->language->get('entry_shipping');
+
+        $data['button_continue'] = $this->language->get('button_continue');
+        $data['button_upload'] = $this->language->get('button_upload');
+
+        $data['customer_groups'] = array();
+
+        if (is_array($this->config->get('config_customer_group_display'))) {
+            $this->load->model('account/customer_group');
+
+            $customer_groups = $this->model_account_customer_group->getCustomerGroups();
+
+            foreach ($customer_groups as $customer_group) {
+                if (in_array($customer_group['customer_group_id'], $this->config->get('config_customer_group_display'))) {
+                    $data['customer_groups'][] = $customer_group;
+                }
+            }
+        }
+
+        if (isset($this->session->data['guest']['customer_group_id'])) {
+            $data['customer_group_id'] = $this->session->data['guest']['customer_group_id'];
+        } else {
+            $data['customer_group_id'] = $this->config->get('config_customer_group_id');
+        }
+
+        if (isset($this->session->data['guest']['firstname'])) {
+            $data['firstname'] = $this->session->data['guest']['firstname'];
+        } else {
+            $data['firstname'] = '';
+        }
+
+        if (isset($this->session->data['guest']['lastname'])) {
+            $data['lastname'] = $this->session->data['guest']['lastname'];
+        } else {
+            $data['lastname'] = '';
+        }
+
+        if (isset($this->session->data['guest']['email'])) {
+            $data['email'] = $this->session->data['guest']['email'];
+        } else {
+            $data['email'] = '';
+        }
+
+        if (isset($this->session->data['guest']['telephone'])) {
+            $data['telephone'] = $this->session->data['guest']['telephone'];
+        } else {
+            $data['telephone'] = '';
+        }
+
+        if (isset($this->session->data['guest']['fax'])) {
+            $data['fax'] = $this->session->data['guest']['fax'];
+        } else {
+            $data['fax'] = '';
+        }
+
+        if (isset($this->session->data['payment_address']['company'])) {
+            $data['company'] = $this->session->data['payment_address']['company'];
+        } else {
+            $data['company'] = '';
+        }
+
+        if (isset($this->session->data['payment_address']['address_1'])) {
+            $data['address_1'] = $this->session->data['payment_address']['address_1'];
+        } else {
+            $data['address_1'] = '';
+        }
+
+        if (isset($this->session->data['payment_address']['address_2'])) {
+            $data['address_2'] = $this->session->data['payment_address']['address_2'];
+        } else {
+            $data['address_2'] = '';
+        }
+
+        if (isset($this->session->data['payment_address']['postcode'])) {
+            $data['postcode'] = $this->session->data['payment_address']['postcode'];
+        } elseif (isset($this->session->data['shipping_address']['postcode'])) {
+            $data['postcode'] = $this->session->data['shipping_address']['postcode'];
+        } else {
+            $data['postcode'] = '';
+        }
+
+        if (isset($this->session->data['payment_address']['city'])) {
+            $data['city'] = $this->session->data['payment_address']['city'];
+        } else {
+            $data['city'] = '';
+        }
+
+        if (isset($this->session->data['payment_address']['country_id'])) {
+            $data['country_id'] = $this->session->data['payment_address']['country_id'];
+        } elseif (isset($this->session->data['shipping_address']['country_id'])) {
+            $data['country_id'] = $this->session->data['shipping_address']['country_id'];
+        } else {
+            $data['country_id'] = $this->config->get('config_country_id');
+        }
+
+        if (isset($this->session->data['payment_address']['zone_id'])) {
+            $data['zone_id'] = $this->session->data['payment_address']['zone_id'];
+        } elseif (isset($this->session->data['shipping_address']['zone_id'])) {
+            $data['zone_id'] = $this->session->data['shipping_address']['zone_id'];
+        } else {
+            $data['zone_id'] = '';
+        }
+
+        $this->load->model('localisation/country');
+
+        $data['countries'] = $this->model_localisation_country->getCountries();
+
+        // Custom Fields
+        $this->load->model('account/custom_field');
+
+        $data['custom_fields'] = $this->model_account_custom_field->getCustomFields();
+
+        if (isset($this->session->data['guest']['custom_field'])) {
+            if (isset($this->session->data['guest']['custom_field'])) {
+                $guest_custom_field = $this->session->data['guest']['custom_field'];
+            } else {
+                $guest_custom_field = array();
+            }
+
+            if (isset($this->session->data['payment_address']['custom_field'])) {
+                $address_custom_field = $this->session->data['payment_address']['custom_field'];
+            } else {
+                $address_custom_field = array();
+            }
+
+            $data['guest_custom_field'] = $guest_custom_field + $address_custom_field;
+        } else {
+            $data['guest_custom_field'] = array();
+        }
+
+        $data['shipping_required'] = $this->cart->hasShipping();
+
+        if (isset($this->session->data['guest']['shipping_address'])) {
+            $data['shipping_address'] = $this->session->data['guest']['shipping_address'];
+        } else {
+            $data['shipping_address'] = true;
+        }
+
+        $this->response->setOutput($this->load->view('checkout/guest', $data));
+    }
+
+    public function save() {
+        $this->load->language('checkout/checkout');
+
+        $json = array();
+
+        // Validate if customer is logged in.
+        if ($this->customer->isLogged()) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
+
+        // Validate cart has products and has stock.
+        if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+            $json['redirect'] = $this->url->link('checkout/cart');
+        }
+
+        // Check if guest checkout is available.
+        if (!$this->config->get('config_checkout_guest') || $this->config->get('config_customer_price') || $this->cart->hasDownload()) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
+
+        if (!$json) {
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) > 32)) {
+                $json['error']['firstname'] = $this->language->get('error_firstname');
+            }
+
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) > 32)) {
+                $json['error']['lastname'] = $this->language->get('error_lastname');
+            }
+
+            if ((\voku\helper\UTF8::strlen($this->request->post['email']) > 96) || !filter_var($this->request->post['email'], FILTER_VALIDATE_EMAIL)) {
+                $json['error']['email'] = $this->language->get('error_email');
+            }
+
+            if ((\voku\helper\UTF8::strlen($this->request->post['telephone']) < 3) || (\voku\helper\UTF8::strlen($this->request->post['telephone']) > 32)) {
+                $json['error']['telephone'] = $this->language->get('error_telephone');
+            }
+
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) < 3) || (\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) > 128)) {
+                $json['error']['address_1'] = $this->language->get('error_address_1');
+            }
+
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['city'])) < 2) || (\voku\helper\UTF8::strlen(trim($this->request->post['city'])) > 128)) {
+                $json['error']['city'] = $this->language->get('error_city');
+            }
+
+            $this->load->model('localisation/country');
+
+            $country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
+
+            if ($country_info && $country_info['postcode_required'] && (\voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) < 2 || \voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) > 10)) {
+                $json['error']['postcode'] = $this->language->get('error_postcode');
+            }
 
-			if ($this->request->post['country_id'] == '') {
-				$json['error']['country'] = $this->language->get('error_country');
-			}
+            if ($this->request->post['country_id'] == '') {
+                $json['error']['country'] = $this->language->get('error_country');
+            }
 
-			if (!isset($this->request->post['zone_id']) || $this->request->post['zone_id'] == '' || !is_numeric($this->request->post['zone_id'])) {
-				$json['error']['zone'] = $this->language->get('error_zone');
-			}
+            if (!isset($this->request->post['zone_id']) || $this->request->post['zone_id'] == '' || !is_numeric($this->request->post['zone_id'])) {
+                $json['error']['zone'] = $this->language->get('error_zone');
+            }
 
-			// Customer Group
-			if (isset($this->request->post['customer_group_id']) && is_array($this->config->get('config_customer_group_display')) && in_array($this->request->post['customer_group_id'], $this->config->get('config_customer_group_display'))) {
-				$customer_group_id = $this->request->post['customer_group_id'];
-			} else {
-				$customer_group_id = $this->config->get('config_customer_group_id');
-			}
+            // Customer Group
+            if (isset($this->request->post['customer_group_id']) && is_array($this->config->get('config_customer_group_display')) && in_array($this->request->post['customer_group_id'], $this->config->get('config_customer_group_display'))) {
+                $customer_group_id = $this->request->post['customer_group_id'];
+            } else {
+                $customer_group_id = $this->config->get('config_customer_group_id');
+            }
 
-			// Custom field validation
-			$this->load->model('account/custom_field');
+            // Custom field validation
+            $this->load->model('account/custom_field');
 
-			$custom_fields = $this->model_account_custom_field->getCustomFields($customer_group_id);
-
-			foreach ($custom_fields as $custom_field) {
-				if ($custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['location']][$custom_field['custom_field_id']])) {
-					$json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
-				} elseif (($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['location']][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
+            $custom_fields = $this->model_account_custom_field->getCustomFields($customer_group_id);
+
+            foreach ($custom_fields as $custom_field) {
+                if ($custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['location']][$custom_field['custom_field_id']])) {
+                    $json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
+                } elseif (($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['location']][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
                     $json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
                 }
-			}
-
-		}
-
-		if (!$json) {
-			$this->session->data['account'] = 'guest';
-
-			$this->session->data['guest']['customer_group_id'] = $customer_group_id;
-			$this->session->data['guest']['firstname'] = $this->request->post['firstname'];
-			$this->session->data['guest']['lastname'] = $this->request->post['lastname'];
-			$this->session->data['guest']['email'] = $this->request->post['email'];
-			$this->session->data['guest']['telephone'] = $this->request->post['telephone'];
-			$this->session->data['guest']['fax'] = $this->request->post['fax'];
-
-			if (isset($this->request->post['custom_field']['account'])) {
-				$this->session->data['guest']['custom_field'] = $this->request->post['custom_field']['account'];
-			} else {
-				$this->session->data['guest']['custom_field'] = array();
-			}
-
-			$this->session->data['payment_address']['firstname'] = $this->request->post['firstname'];
-			$this->session->data['payment_address']['lastname'] = $this->request->post['lastname'];
-			$this->session->data['payment_address']['company'] = $this->request->post['company'];
-			$this->session->data['payment_address']['address_1'] = $this->request->post['address_1'];
-			$this->session->data['payment_address']['address_2'] = $this->request->post['address_2'];
-			$this->session->data['payment_address']['postcode'] = $this->request->post['postcode'];
-			$this->session->data['payment_address']['city'] = $this->request->post['city'];
-			$this->session->data['payment_address']['country_id'] = $this->request->post['country_id'];
-			$this->session->data['payment_address']['zone_id'] = $this->request->post['zone_id'];
-
-			$this->load->model('localisation/country');
-
-			$country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
-
-			if ($country_info) {
-				$this->session->data['payment_address']['country'] = $country_info['name'];
-				$this->session->data['payment_address']['iso_code_2'] = $country_info['iso_code_2'];
-				$this->session->data['payment_address']['iso_code_3'] = $country_info['iso_code_3'];
-				$this->session->data['payment_address']['address_format'] = $country_info['address_format'];
-			} else {
-				$this->session->data['payment_address']['country'] = '';
-				$this->session->data['payment_address']['iso_code_2'] = '';
-				$this->session->data['payment_address']['iso_code_3'] = '';
-				$this->session->data['payment_address']['address_format'] = '';
-			}
-
-			if (isset($this->request->post['custom_field']['address'])) {
-				$this->session->data['payment_address']['custom_field'] = $this->request->post['custom_field']['address'];
-			} else {
-				$this->session->data['payment_address']['custom_field'] = array();
-			}
-
-			$this->load->model('localisation/zone');
-
-			$zone_info = $this->model_localisation_zone->getZone($this->request->post['zone_id']);
-
-			if ($zone_info) {
-				$this->session->data['payment_address']['zone'] = $zone_info['name'];
-				$this->session->data['payment_address']['zone_code'] = $zone_info['code'];
-			} else {
-				$this->session->data['payment_address']['zone'] = '';
-				$this->session->data['payment_address']['zone_code'] = '';
-			}
-
-			if (!empty($this->request->post['shipping_address'])) {
-				$this->session->data['guest']['shipping_address'] = $this->request->post['shipping_address'];
-			} else {
-				$this->session->data['guest']['shipping_address'] = false;
-			}
-
-			if ($this->session->data['guest']['shipping_address']) {
-				$this->session->data['shipping_address']['firstname'] = $this->request->post['firstname'];
-				$this->session->data['shipping_address']['lastname'] = $this->request->post['lastname'];
-				$this->session->data['shipping_address']['company'] = $this->request->post['company'];
-				$this->session->data['shipping_address']['address_1'] = $this->request->post['address_1'];
-				$this->session->data['shipping_address']['address_2'] = $this->request->post['address_2'];
-				$this->session->data['shipping_address']['postcode'] = $this->request->post['postcode'];
-				$this->session->data['shipping_address']['city'] = $this->request->post['city'];
-				$this->session->data['shipping_address']['country_id'] = $this->request->post['country_id'];
-				$this->session->data['shipping_address']['zone_id'] = $this->request->post['zone_id'];
-
-				if ($country_info) {
-					$this->session->data['shipping_address']['country'] = $country_info['name'];
-					$this->session->data['shipping_address']['iso_code_2'] = $country_info['iso_code_2'];
-					$this->session->data['shipping_address']['iso_code_3'] = $country_info['iso_code_3'];
-					$this->session->data['shipping_address']['address_format'] = $country_info['address_format'];
-				} else {
-					$this->session->data['shipping_address']['country'] = '';
-					$this->session->data['shipping_address']['iso_code_2'] = '';
-					$this->session->data['shipping_address']['iso_code_3'] = '';
-					$this->session->data['shipping_address']['address_format'] = '';
-				}
-
-				if ($zone_info) {
-					$this->session->data['shipping_address']['zone'] = $zone_info['name'];
-					$this->session->data['shipping_address']['zone_code'] = $zone_info['code'];
-				} else {
-					$this->session->data['shipping_address']['zone'] = '';
-					$this->session->data['shipping_address']['zone_code'] = '';
-				}
-
-				if (isset($this->request->post['custom_field']['address'])) {
-					$this->session->data['shipping_address']['custom_field'] = $this->request->post['custom_field']['address'];
-				} else {
-					$this->session->data['shipping_address']['custom_field'] = array();
-				}
-			}
-
-			unset($this->session->data['shipping_method']);
-			unset($this->session->data['shipping_methods']);
-			unset($this->session->data['payment_method']);
-			unset($this->session->data['payment_methods']);
-		}
-
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
+            }
+
+        }
+
+        if (!$json) {
+            $this->session->data['account'] = 'guest';
+
+            $this->session->data['guest']['customer_group_id'] = $customer_group_id;
+            $this->session->data['guest']['firstname'] = $this->request->post['firstname'];
+            $this->session->data['guest']['lastname'] = $this->request->post['lastname'];
+            $this->session->data['guest']['email'] = $this->request->post['email'];
+            $this->session->data['guest']['telephone'] = $this->request->post['telephone'];
+            $this->session->data['guest']['fax'] = $this->request->post['fax'];
+
+            if (isset($this->request->post['custom_field']['account'])) {
+                $this->session->data['guest']['custom_field'] = $this->request->post['custom_field']['account'];
+            } else {
+                $this->session->data['guest']['custom_field'] = array();
+            }
+
+            $this->session->data['payment_address']['firstname'] = $this->request->post['firstname'];
+            $this->session->data['payment_address']['lastname'] = $this->request->post['lastname'];
+            $this->session->data['payment_address']['company'] = $this->request->post['company'];
+            $this->session->data['payment_address']['address_1'] = $this->request->post['address_1'];
+            $this->session->data['payment_address']['address_2'] = $this->request->post['address_2'];
+            $this->session->data['payment_address']['postcode'] = $this->request->post['postcode'];
+            $this->session->data['payment_address']['city'] = $this->request->post['city'];
+            $this->session->data['payment_address']['country_id'] = $this->request->post['country_id'];
+            $this->session->data['payment_address']['zone_id'] = $this->request->post['zone_id'];
+
+            $this->load->model('localisation/country');
+
+            $country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
+
+            if ($country_info) {
+                $this->session->data['payment_address']['country'] = $country_info['name'];
+                $this->session->data['payment_address']['iso_code_2'] = $country_info['iso_code_2'];
+                $this->session->data['payment_address']['iso_code_3'] = $country_info['iso_code_3'];
+                $this->session->data['payment_address']['address_format'] = $country_info['address_format'];
+            } else {
+                $this->session->data['payment_address']['country'] = '';
+                $this->session->data['payment_address']['iso_code_2'] = '';
+                $this->session->data['payment_address']['iso_code_3'] = '';
+                $this->session->data['payment_address']['address_format'] = '';
+            }
+
+            if (isset($this->request->post['custom_field']['address'])) {
+                $this->session->data['payment_address']['custom_field'] = $this->request->post['custom_field']['address'];
+            } else {
+                $this->session->data['payment_address']['custom_field'] = array();
+            }
+
+            $this->load->model('localisation/zone');
+
+            $zone_info = $this->model_localisation_zone->getZone($this->request->post['zone_id']);
+
+            if ($zone_info) {
+                $this->session->data['payment_address']['zone'] = $zone_info['name'];
+                $this->session->data['payment_address']['zone_code'] = $zone_info['code'];
+            } else {
+                $this->session->data['payment_address']['zone'] = '';
+                $this->session->data['payment_address']['zone_code'] = '';
+            }
+
+            if (!empty($this->request->post['shipping_address'])) {
+                $this->session->data['guest']['shipping_address'] = $this->request->post['shipping_address'];
+            } else {
+                $this->session->data['guest']['shipping_address'] = false;
+            }
+
+            if ($this->session->data['guest']['shipping_address']) {
+                $this->session->data['shipping_address']['firstname'] = $this->request->post['firstname'];
+                $this->session->data['shipping_address']['lastname'] = $this->request->post['lastname'];
+                $this->session->data['shipping_address']['company'] = $this->request->post['company'];
+                $this->session->data['shipping_address']['address_1'] = $this->request->post['address_1'];
+                $this->session->data['shipping_address']['address_2'] = $this->request->post['address_2'];
+                $this->session->data['shipping_address']['postcode'] = $this->request->post['postcode'];
+                $this->session->data['shipping_address']['city'] = $this->request->post['city'];
+                $this->session->data['shipping_address']['country_id'] = $this->request->post['country_id'];
+                $this->session->data['shipping_address']['zone_id'] = $this->request->post['zone_id'];
+
+                if ($country_info) {
+                    $this->session->data['shipping_address']['country'] = $country_info['name'];
+                    $this->session->data['shipping_address']['iso_code_2'] = $country_info['iso_code_2'];
+                    $this->session->data['shipping_address']['iso_code_3'] = $country_info['iso_code_3'];
+                    $this->session->data['shipping_address']['address_format'] = $country_info['address_format'];
+                } else {
+                    $this->session->data['shipping_address']['country'] = '';
+                    $this->session->data['shipping_address']['iso_code_2'] = '';
+                    $this->session->data['shipping_address']['iso_code_3'] = '';
+                    $this->session->data['shipping_address']['address_format'] = '';
+                }
+
+                if ($zone_info) {
+                    $this->session->data['shipping_address']['zone'] = $zone_info['name'];
+                    $this->session->data['shipping_address']['zone_code'] = $zone_info['code'];
+                } else {
+                    $this->session->data['shipping_address']['zone'] = '';
+                    $this->session->data['shipping_address']['zone_code'] = '';
+                }
+
+                if (isset($this->request->post['custom_field']['address'])) {
+                    $this->session->data['shipping_address']['custom_field'] = $this->request->post['custom_field']['address'];
+                } else {
+                    $this->session->data['shipping_address']['custom_field'] = array();
+                }
+            }
+
+            unset($this->session->data['shipping_method']);
+            unset($this->session->data['shipping_methods']);
+            unset($this->session->data['payment_method']);
+            unset($this->session->data['payment_methods']);
+        }
+
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
 }

application/controller/checkout/payment_address.php

Indentation +138 added lines, -138 removed lines

@@ -21,183 +21,183 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 class ControllerCheckoutPaymentAddress extends \Sunrise\Engine\Core\Controller {
-	public function index() {
-		$this->load->language('checkout/checkout');
+    public function index() {
+        $this->load->language('checkout/checkout');
 
-		$data['text_address_existing'] = $this->language->get('text_address_existing');
-		$data['text_address_new'] = $this->language->get('text_address_new');
-		$data['text_select'] = $this->language->get('text_select');
-		$data['text_none'] = $this->language->get('text_none');
-		$data['text_loading'] = $this->language->get('text_loading');
-
-		$data['entry_firstname'] = $this->language->get('entry_firstname');
-		$data['entry_lastname'] = $this->language->get('entry_lastname');
-		$data['entry_company'] = $this->language->get('entry_company');
-		$data['entry_address_1'] = $this->language->get('entry_address_1');
-		$data['entry_address_2'] = $this->language->get('entry_address_2');
-		$data['entry_postcode'] = $this->language->get('entry_postcode');
-		$data['entry_city'] = $this->language->get('entry_city');
-		$data['entry_country'] = $this->language->get('entry_country');
-		$data['entry_zone'] = $this->language->get('entry_zone');
-
-		$data['button_continue'] = $this->language->get('button_continue');
-		$data['button_upload'] = $this->language->get('button_upload');
-
-		if (isset($this->session->data['payment_address']['address_id'])) {
-			$data['address_id'] = $this->session->data['payment_address']['address_id'];
-		} else {
-			$data['address_id'] = $this->customer->getAddressId();
-		}
-
-		$this->load->model('account/address');
-
-		$data['addresses'] = $this->model_account_address->getAddresses();
-
-		if (isset($this->session->data['payment_address']['country_id'])) {
-			$data['country_id'] = $this->session->data['payment_address']['country_id'];
-		} else {
-			$data['country_id'] = $this->config->get('config_country_id');
-		}
+        $data['text_address_existing'] = $this->language->get('text_address_existing');
+        $data['text_address_new'] = $this->language->get('text_address_new');
+        $data['text_select'] = $this->language->get('text_select');
+        $data['text_none'] = $this->language->get('text_none');
+        $data['text_loading'] = $this->language->get('text_loading');
+
+        $data['entry_firstname'] = $this->language->get('entry_firstname');
+        $data['entry_lastname'] = $this->language->get('entry_lastname');
+        $data['entry_company'] = $this->language->get('entry_company');
+        $data['entry_address_1'] = $this->language->get('entry_address_1');
+        $data['entry_address_2'] = $this->language->get('entry_address_2');
+        $data['entry_postcode'] = $this->language->get('entry_postcode');
+        $data['entry_city'] = $this->language->get('entry_city');
+        $data['entry_country'] = $this->language->get('entry_country');
+        $data['entry_zone'] = $this->language->get('entry_zone');
+
+        $data['button_continue'] = $this->language->get('button_continue');
+        $data['button_upload'] = $this->language->get('button_upload');
+
+        if (isset($this->session->data['payment_address']['address_id'])) {
+            $data['address_id'] = $this->session->data['payment_address']['address_id'];
+        } else {
+            $data['address_id'] = $this->customer->getAddressId();
+        }
+
+        $this->load->model('account/address');
+
+        $data['addresses'] = $this->model_account_address->getAddresses();
+
+        if (isset($this->session->data['payment_address']['country_id'])) {
+            $data['country_id'] = $this->session->data['payment_address']['country_id'];
+        } else {
+            $data['country_id'] = $this->config->get('config_country_id');
+        }
 
-		if (isset($this->session->data['payment_address']['zone_id'])) {
-			$data['zone_id'] = $this->session->data['payment_address']['zone_id'];
-		} else {
-			$data['zone_id'] = '';
-		}
+        if (isset($this->session->data['payment_address']['zone_id'])) {
+            $data['zone_id'] = $this->session->data['payment_address']['zone_id'];
+        } else {
+            $data['zone_id'] = '';
+        }
 
-		$this->load->model('localisation/country');
+        $this->load->model('localisation/country');
 
-		$data['countries'] = $this->model_localisation_country->getCountries();
+        $data['countries'] = $this->model_localisation_country->getCountries();
 
-		// Custom Fields
-		$this->load->model('account/custom_field');
+        // Custom Fields
+        $this->load->model('account/custom_field');
 
-		$data['custom_fields'] = $this->model_account_custom_field->getCustomFields($this->config->get('config_customer_group_id'));
+        $data['custom_fields'] = $this->model_account_custom_field->getCustomFields($this->config->get('config_customer_group_id'));
 
-		if (isset($this->session->data['payment_address']['custom_field'])) {
-			$data['payment_address_custom_field'] = $this->session->data['payment_address']['custom_field'];
-		} else {
-			$data['payment_address_custom_field'] = array();
-		}
+        if (isset($this->session->data['payment_address']['custom_field'])) {
+            $data['payment_address_custom_field'] = $this->session->data['payment_address']['custom_field'];
+        } else {
+            $data['payment_address_custom_field'] = array();
+        }
 
-		$this->response->setOutput($this->load->view('checkout/payment_address', $data));
-	}
+        $this->response->setOutput($this->load->view('checkout/payment_address', $data));
+    }
 
-	public function save() {
-		$this->load->language('checkout/checkout');
+    public function save() {
+        $this->load->language('checkout/checkout');
 
-		$json = array();
+        $json = array();
 
-		// Validate if customer is logged in.
-		if (!$this->customer->isLogged()) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
+        // Validate if customer is logged in.
+        if (!$this->customer->isLogged()) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
 
-		// Validate cart has products and has stock.
-		if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
-			$json['redirect'] = $this->url->link('checkout/cart');
-		}
+        // Validate cart has products and has stock.
+        if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+            $json['redirect'] = $this->url->link('checkout/cart');
+        }
 
-		// Validate minimum quantity requirements.
-		$products = $this->cart->getProducts();
+        // Validate minimum quantity requirements.
+        $products = $this->cart->getProducts();
 
-		foreach ($products as $product) {
-			$product_total = 0;
+        foreach ($products as $product) {
+            $product_total = 0;
 
-			foreach ($products as $product_2) {
-				if ($product_2['product_id'] == $product['product_id']) {
-					$product_total += $product_2['quantity'];
-				}
-			}
+            foreach ($products as $product_2) {
+                if ($product_2['product_id'] == $product['product_id']) {
+                    $product_total += $product_2['quantity'];
+                }
+            }
 
-			if ($product['minimum'] > $product_total) {
-				$json['redirect'] = $this->url->link('checkout/cart');
+            if ($product['minimum'] > $product_total) {
+                $json['redirect'] = $this->url->link('checkout/cart');
 
-				break;
-			}
-		}
+                break;
+            }
+        }
 
-		if (!$json) {
-			if (isset($this->request->post['payment_address']) && $this->request->post['payment_address'] == 'existing') {
-				$this->load->model('account/address');
+        if (!$json) {
+            if (isset($this->request->post['payment_address']) && $this->request->post['payment_address'] == 'existing') {
+                $this->load->model('account/address');
 
-				if (empty($this->request->post['address_id'])) {
-					$json['error']['warning'] = $this->language->get('error_address');
-				} elseif (!in_array($this->request->post['address_id'], array_keys($this->model_account_address->getAddresses()))) {
-					$json['error']['warning'] = $this->language->get('error_address');
-				}
+                if (empty($this->request->post['address_id'])) {
+                    $json['error']['warning'] = $this->language->get('error_address');
+                } elseif (!in_array($this->request->post['address_id'], array_keys($this->model_account_address->getAddresses()))) {
+                    $json['error']['warning'] = $this->language->get('error_address');
+                }
 
-				if (!$json) {
-					// Default Payment Address
-					$this->load->model('account/address');
+                if (!$json) {
+                    // Default Payment Address
+                    $this->load->model('account/address');
 
-					$this->session->data['payment_address'] = $this->model_account_address->getAddress($this->request->post['address_id']);
+                    $this->session->data['payment_address'] = $this->model_account_address->getAddress($this->request->post['address_id']);
 
-					unset($this->session->data['payment_method']);
-					unset($this->session->data['payment_methods']);
-				}
-			} else {
-				if ((\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) > 32)) {
-					$json['error']['firstname'] = $this->language->get('error_firstname');
-				}
+                    unset($this->session->data['payment_method']);
+                    unset($this->session->data['payment_methods']);
+                }
+            } else {
+                if ((\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) > 32)) {
+                    $json['error']['firstname'] = $this->language->get('error_firstname');
+                }
 
-				if ((\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) > 32)) {
-					$json['error']['lastname'] = $this->language->get('error_lastname');
-				}
+                if ((\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) > 32)) {
+                    $json['error']['lastname'] = $this->language->get('error_lastname');
+                }
 
-				if ((\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) < 3) || (\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) > 128)) {
-					$json['error']['address_1'] = $this->language->get('error_address_1');
-				}
+                if ((\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) < 3) || (\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) > 128)) {
+                    $json['error']['address_1'] = $this->language->get('error_address_1');
+                }
 
-				if ((\voku\helper\UTF8::strlen($this->request->post['city']) < 2) || (\voku\helper\UTF8::strlen($this->request->post['city']) > 32)) {
-					$json['error']['city'] = $this->language->get('error_city');
-				}
+                if ((\voku\helper\UTF8::strlen($this->request->post['city']) < 2) || (\voku\helper\UTF8::strlen($this->request->post['city']) > 32)) {
+                    $json['error']['city'] = $this->language->get('error_city');
+                }
 
-				$this->load->model('localisation/country');
+                $this->load->model('localisation/country');
 
-				$country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
+                $country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
 
-				if ($country_info && $country_info['postcode_required'] && (\voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) < 2 || \voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) > 10)) {
-					$json['error']['postcode'] = $this->language->get('error_postcode');
-				}
+                if ($country_info && $country_info['postcode_required'] && (\voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) < 2 || \voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) > 10)) {
+                    $json['error']['postcode'] = $this->language->get('error_postcode');
+                }
 
-				if ($this->request->post['country_id'] == '') {
-					$json['error']['country'] = $this->language->get('error_country');
-				}
+                if ($this->request->post['country_id'] == '') {
+                    $json['error']['country'] = $this->language->get('error_country');
+                }
 
-				if (!isset($this->request->post['zone_id']) || $this->request->post['zone_id'] == '' || !is_numeric($this->request->post['zone_id'])) {
-					$json['error']['zone'] = $this->language->get('error_zone');
-				}
+                if (!isset($this->request->post['zone_id']) || $this->request->post['zone_id'] == '' || !is_numeric($this->request->post['zone_id'])) {
+                    $json['error']['zone'] = $this->language->get('error_zone');
+                }
 
-				// Custom field validation
-				$this->load->model('account/custom_field');
+                // Custom field validation
+                $this->load->model('account/custom_field');
 
-				$custom_fields = $this->model_account_custom_field->getCustomFields($this->config->get('config_customer_group_id'));
+                $custom_fields = $this->model_account_custom_field->getCustomFields($this->config->get('config_customer_group_id'));
 
-				foreach ($custom_fields as $custom_field) {
-					if (($custom_field['location'] == 'address') && $custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['custom_field_id']])) {
-						$json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
-					} elseif (($custom_field['location'] == 'address') && ($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
+                foreach ($custom_fields as $custom_field) {
+                    if (($custom_field['location'] == 'address') && $custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['custom_field_id']])) {
+                        $json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
+                    } elseif (($custom_field['location'] == 'address') && ($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
                         $json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
                     }
-				}
+                }
 
-				if (!$json) {
-					// Default Payment Address
-					$this->load->model('account/address');
+                if (!$json) {
+                    // Default Payment Address
+                    $this->load->model('account/address');
 
-					$address_id = $this->model_account_address->addAddress($this->request->post);
+                    $address_id = $this->model_account_address->addAddress($this->request->post);
 
-					$this->session->data['payment_address'] = $this->model_account_address->getAddress($address_id);
+                    $this->session->data['payment_address'] = $this->model_account_address->getAddress($address_id);
 
-					unset($this->session->data['payment_method']);
-					unset($this->session->data['payment_methods']);
+                    unset($this->session->data['payment_method']);
+                    unset($this->session->data['payment_methods']);
 
-				}
-			}
-		}
+                }
+            }
+        }
 
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
 }
\ No newline at end of file

application/controller/checkout/payment_method.php

Indentation +138 added lines, -138 removed lines

@@ -21,183 +21,183 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 class ControllerCheckoutPaymentMethod extends \Sunrise\Engine\Core\Controller {
-	public function index() {
-		$this->load->language('checkout/checkout');
-
-		if (isset($this->session->data['payment_address'])) {
-			// Totals
-			$totals = array();
-			$total = 0;
-
-			// Because __call can not keep var references so we put them into an array.
-			$total_data = array(
-				'totals' => &$totals,
-				'total'  => &$total
-			);
+    public function index() {
+        $this->load->language('checkout/checkout');
+
+        if (isset($this->session->data['payment_address'])) {
+            // Totals
+            $totals = array();
+            $total = 0;
+
+            // Because __call can not keep var references so we put them into an array.
+            $total_data = array(
+                'totals' => &$totals,
+                'total'  => &$total
+            );
 			
-			$this->load->model('extension/extension');
+            $this->load->model('extension/extension');
 
-			$sort_order = array();
+            $sort_order = array();
 
-			$results = $this->model_extension_extension->getExtensions('total');
+            $results = $this->model_extension_extension->getExtensions('total');
 
-			foreach ($results as $key => $value) {
-				$sort_order[$key] = $this->config->get($value['code'] . '_sort_order');
-			}
+            foreach ($results as $key => $value) {
+                $sort_order[$key] = $this->config->get($value['code'] . '_sort_order');
+            }
 
-			array_multisort($sort_order, SORT_ASC, $results);
+            array_multisort($sort_order, SORT_ASC, $results);
 
-			foreach ($results as $result) {
-				if ($this->config->get($result['code'] . '_status')) {
-					$this->load->model('extension/total/' . $result['code']);
+            foreach ($results as $result) {
+                if ($this->config->get($result['code'] . '_status')) {
+                    $this->load->model('extension/total/' . $result['code']);
 					
-					// We have to put the totals in an array so that they pass by reference.
-					$this->{'model_extension_total_' . $result['code']}->getTotal($total_data);
-				}
-			}
+                    // We have to put the totals in an array so that they pass by reference.
+                    $this->{'model_extension_total_' . $result['code']}->getTotal($total_data);
+                }
+            }
 
-			// Payment Methods
-			$method_data = array();
+            // Payment Methods
+            $method_data = array();
 
-			$this->load->model('extension/extension');
+            $this->load->model('extension/extension');
 
-			$results = $this->model_extension_extension->getExtensions('payment');
+            $results = $this->model_extension_extension->getExtensions('payment');
 
-			foreach ($results as $result) {
-				if ($this->config->get($result['code'] . '_status')) {
-					$this->load->model('extension/payment/' . $result['code']);
+            foreach ($results as $result) {
+                if ($this->config->get($result['code'] . '_status')) {
+                    $this->load->model('extension/payment/' . $result['code']);
 
-					$method = $this->{'model_extension_payment_' . $result['code']}->getMethod($this->session->data['payment_address'], $total);
+                    $method = $this->{'model_extension_payment_' . $result['code']}->getMethod($this->session->data['payment_address'], $total);
 
-					if ($method) {
-						$method_data[$result['code']] = $method;
-					}
-				}
-			}
+                    if ($method) {
+                        $method_data[$result['code']] = $method;
+                    }
+                }
+            }
 
-			$sort_order = array();
+            $sort_order = array();
 
-			foreach ($method_data as $key => $value) {
-				$sort_order[$key] = $value['sort_order'];
-			}
+            foreach ($method_data as $key => $value) {
+                $sort_order[$key] = $value['sort_order'];
+            }
 
-			array_multisort($sort_order, SORT_ASC, $method_data);
+            array_multisort($sort_order, SORT_ASC, $method_data);
 
-			$this->session->data['payment_methods'] = $method_data;
-		}
+            $this->session->data['payment_methods'] = $method_data;
+        }
 
-		$data['text_payment_method'] = $this->language->get('text_payment_method');
-		$data['text_comments'] = $this->language->get('text_comments');
-		$data['text_loading'] = $this->language->get('text_loading');
+        $data['text_payment_method'] = $this->language->get('text_payment_method');
+        $data['text_comments'] = $this->language->get('text_comments');
+        $data['text_loading'] = $this->language->get('text_loading');
 
-		$data['button_continue'] = $this->language->get('button_continue');
+        $data['button_continue'] = $this->language->get('button_continue');
 
-		if (empty($this->session->data['payment_methods'])) {
-			$data['error_warning'] = sprintf($this->language->get('error_no_payment'), $this->url->link('information/contact'));
-		} else {
-			$data['error_warning'] = '';
-		}
+        if (empty($this->session->data['payment_methods'])) {
+            $data['error_warning'] = sprintf($this->language->get('error_no_payment'), $this->url->link('information/contact'));
+        } else {
+            $data['error_warning'] = '';
+        }
 
-		if (isset($this->session->data['payment_methods'])) {
-			$data['payment_methods'] = $this->session->data['payment_methods'];
-		} else {
-			$data['payment_methods'] = array();
-		}
+        if (isset($this->session->data['payment_methods'])) {
+            $data['payment_methods'] = $this->session->data['payment_methods'];
+        } else {
+            $data['payment_methods'] = array();
+        }
 
-		if (isset($this->session->data['payment_method']['code'])) {
-			$data['code'] = $this->session->data['payment_method']['code'];
-		} else {
-			$data['code'] = '';
-		}
+        if (isset($this->session->data['payment_method']['code'])) {
+            $data['code'] = $this->session->data['payment_method']['code'];
+        } else {
+            $data['code'] = '';
+        }
 
-		if (isset($this->session->data['comment'])) {
-			$data['comment'] = $this->session->data['comment'];
-		} else {
-			$data['comment'] = '';
-		}
+        if (isset($this->session->data['comment'])) {
+            $data['comment'] = $this->session->data['comment'];
+        } else {
+            $data['comment'] = '';
+        }
 
-		$data['scripts'] = $this->document->getScripts();
+        $data['scripts'] = $this->document->getScripts();
 
-		if ($this->config->get('config_checkout_id')) {
-			$this->load->model('catalog/information');
+        if ($this->config->get('config_checkout_id')) {
+            $this->load->model('catalog/information');
 
-			$information_info = $this->model_catalog_information->getInformation($this->config->get('config_checkout_id'));
+            $information_info = $this->model_catalog_information->getInformation($this->config->get('config_checkout_id'));
 
-			if ($information_info) {
-				$data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information/agree', 'information_id=' . $this->config->get('config_checkout_id'), true), $information_info['title'], $information_info['title']);
-			} else {
-				$data['text_agree'] = '';
-			}
-		} else {
-			$data['text_agree'] = '';
-		}
+            if ($information_info) {
+                $data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information/agree', 'information_id=' . $this->config->get('config_checkout_id'), true), $information_info['title'], $information_info['title']);
+            } else {
+                $data['text_agree'] = '';
+            }
+        } else {
+            $data['text_agree'] = '';
+        }
 
-		if (isset($this->session->data['agree'])) {
-			$data['agree'] = $this->session->data['agree'];
-		} else {
-			$data['agree'] = '';
-		}
+        if (isset($this->session->data['agree'])) {
+            $data['agree'] = $this->session->data['agree'];
+        } else {
+            $data['agree'] = '';
+        }
 
-		$this->response->setOutput($this->load->view('checkout/payment_method', $data));
-	}
+        $this->response->setOutput($this->load->view('checkout/payment_method', $data));
+    }
 
-	public function save() {
-		$this->load->language('checkout/checkout');
+    public function save() {
+        $this->load->language('checkout/checkout');
 
-		$json = array();
+        $json = array();
 
-		// Validate if payment address has been set.
-		if (!isset($this->session->data['payment_address'])) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
+        // Validate if payment address has been set.
+        if (!isset($this->session->data['payment_address'])) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
 
-		// Validate cart has products and has stock.
-		if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
-			$json['redirect'] = $this->url->link('checkout/cart');
-		}
+        // Validate cart has products and has stock.
+        if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+            $json['redirect'] = $this->url->link('checkout/cart');
+        }
 
-		// Validate minimum quantity requirements.
-		$products = $this->cart->getProducts();
+        // Validate minimum quantity requirements.
+        $products = $this->cart->getProducts();
 
-		foreach ($products as $product) {
-			$product_total = 0;
+        foreach ($products as $product) {
+            $product_total = 0;
 
-			foreach ($products as $product_2) {
-				if ($product_2['product_id'] == $product['product_id']) {
-					$product_total += $product_2['quantity'];
-				}
-			}
+            foreach ($products as $product_2) {
+                if ($product_2['product_id'] == $product['product_id']) {
+                    $product_total += $product_2['quantity'];
+                }
+            }
 
-			if ($product['minimum'] > $product_total) {
-				$json['redirect'] = $this->url->link('checkout/cart');
+            if ($product['minimum'] > $product_total) {
+                $json['redirect'] = $this->url->link('checkout/cart');
 
-				break;
-			}
-		}
+                break;
+            }
+        }
 
-		if (!isset($this->request->post['payment_method'])) {
-			$json['error']['warning'] = $this->language->get('error_payment');
-		} elseif (!isset($this->session->data['payment_methods'][$this->request->post['payment_method']])) {
-			$json['error']['warning'] = $this->language->get('error_payment');
-		}
+        if (!isset($this->request->post['payment_method'])) {
+            $json['error']['warning'] = $this->language->get('error_payment');
+        } elseif (!isset($this->session->data['payment_methods'][$this->request->post['payment_method']])) {
+            $json['error']['warning'] = $this->language->get('error_payment');
+        }
 
-		if ($this->config->get('config_checkout_id')) {
-			$this->load->model('catalog/information');
-
-			$information_info = $this->model_catalog_information->getInformation($this->config->get('config_checkout_id'));
+        if ($this->config->get('config_checkout_id')) {
+            $this->load->model('catalog/information');
+
+            $information_info = $this->model_catalog_information->getInformation($this->config->get('config_checkout_id'));
 
-			if ($information_info && !isset($this->request->post['agree'])) {
-				$json['error']['warning'] = sprintf($this->language->get('error_agree'), $information_info['title']);
-			}
-		}
-
-		if (!$json) {
-			$this->session->data['payment_method'] = $this->session->data['payment_methods'][$this->request->post['payment_method']];
-
-			$this->session->data['comment'] = strip_tags($this->request->post['comment']);
-		}
-
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
+            if ($information_info && !isset($this->request->post['agree'])) {
+                $json['error']['warning'] = sprintf($this->language->get('error_agree'), $information_info['title']);
+            }
+        }
+
+        if (!$json) {
+            $this->session->data['payment_method'] = $this->session->data['payment_methods'][$this->request->post['payment_method']];
+
+            $this->session->data['comment'] = strip_tags($this->request->post['comment']);
+        }
+
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
 }

application/controller/checkout/shipping_method.php

Indentation +101 added lines, -101 removed lines

@@ -21,134 +21,134 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 class ControllerCheckoutShippingMethod extends \Sunrise\Engine\Core\Controller {
-	public function index() {
-		$this->load->language('checkout/checkout');
+    public function index() {
+        $this->load->language('checkout/checkout');
 
-		if (isset($this->session->data['shipping_address'])) {
-			// Shipping Methods
-			$method_data = array();
+        if (isset($this->session->data['shipping_address'])) {
+            // Shipping Methods
+            $method_data = array();
 
-			$this->load->model('extension/extension');
+            $this->load->model('extension/extension');
 
-			$results = $this->model_extension_extension->getExtensions('shipping');
+            $results = $this->model_extension_extension->getExtensions('shipping');
 
-			foreach ($results as $result) {
-				if ($this->config->get($result['code'] . '_status')) {
-					$this->load->model('extension/shipping/' . $result['code']);
+            foreach ($results as $result) {
+                if ($this->config->get($result['code'] . '_status')) {
+                    $this->load->model('extension/shipping/' . $result['code']);
 
-					$quote = $this->{'model_extension_shipping_' . $result['code']}->getQuote($this->session->data['shipping_address']);
+                    $quote = $this->{'model_extension_shipping_' . $result['code']}->getQuote($this->session->data['shipping_address']);
 
-					if ($quote) {
-						$method_data[$result['code']] = array(
-							'title'      => $quote['title'],
-							'quote'      => $quote['quote'],
-							'sort_order' => $quote['sort_order'],
-							'error'      => $quote['error']
-						);
-					}
-				}
-			}
+                    if ($quote) {
+                        $method_data[$result['code']] = array(
+                            'title'      => $quote['title'],
+                            'quote'      => $quote['quote'],
+                            'sort_order' => $quote['sort_order'],
+                            'error'      => $quote['error']
+                        );
+                    }
+                }
+            }
 
-			$sort_order = array();
+            $sort_order = array();
 
-			foreach ($method_data as $key => $value) {
-				$sort_order[$key] = $value['sort_order'];
-			}
+            foreach ($method_data as $key => $value) {
+                $sort_order[$key] = $value['sort_order'];
+            }
 
-			array_multisort($sort_order, SORT_ASC, $method_data);
+            array_multisort($sort_order, SORT_ASC, $method_data);
 
-			$this->session->data['shipping_methods'] = $method_data;
-		}
+            $this->session->data['shipping_methods'] = $method_data;
+        }
 
-		$data['text_shipping_method'] = $this->language->get('text_shipping_method');
-		$data['text_comments'] = $this->language->get('text_comments');
-		$data['text_loading'] = $this->language->get('text_loading');
+        $data['text_shipping_method'] = $this->language->get('text_shipping_method');
+        $data['text_comments'] = $this->language->get('text_comments');
+        $data['text_loading'] = $this->language->get('text_loading');
 
-		$data['button_continue'] = $this->language->get('button_continue');
+        $data['button_continue'] = $this->language->get('button_continue');
 
-		if (empty($this->session->data['shipping_methods'])) {
-			$data['error_warning'] = sprintf($this->language->get('error_no_shipping'), $this->url->link('information/contact'));
-		} else {
-			$data['error_warning'] = '';
-		}
+        if (empty($this->session->data['shipping_methods'])) {
+            $data['error_warning'] = sprintf($this->language->get('error_no_shipping'), $this->url->link('information/contact'));
+        } else {
+            $data['error_warning'] = '';
+        }
 
-		if (isset($this->session->data['shipping_methods'])) {
-			$data['shipping_methods'] = $this->session->data['shipping_methods'];
-		} else {
-			$data['shipping_methods'] = array();
-		}
+        if (isset($this->session->data['shipping_methods'])) {
+            $data['shipping_methods'] = $this->session->data['shipping_methods'];
+        } else {
+            $data['shipping_methods'] = array();
+        }
 
-		if (isset($this->session->data['shipping_method']['code'])) {
-			$data['code'] = $this->session->data['shipping_method']['code'];
-		} else {
-			$data['code'] = '';
-		}
+        if (isset($this->session->data['shipping_method']['code'])) {
+            $data['code'] = $this->session->data['shipping_method']['code'];
+        } else {
+            $data['code'] = '';
+        }
 
-		if (isset($this->session->data['comment'])) {
-			$data['comment'] = $this->session->data['comment'];
-		} else {
-			$data['comment'] = '';
-		}
+        if (isset($this->session->data['comment'])) {
+            $data['comment'] = $this->session->data['comment'];
+        } else {
+            $data['comment'] = '';
+        }
 
-		$this->response->setOutput($this->load->view('checkout/shipping_method', $data));
-	}
+        $this->response->setOutput($this->load->view('checkout/shipping_method', $data));
+    }
 
-	public function save() {
-		$this->load->language('checkout/checkout');
+    public function save() {
+        $this->load->language('checkout/checkout');
 
-		$json = array();
+        $json = array();
 
-		// Validate if shipping is required. If not the customer should not have reached this page.
-		if (!$this->cart->hasShipping()) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
+        // Validate if shipping is required. If not the customer should not have reached this page.
+        if (!$this->cart->hasShipping()) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
 
-		// Validate if shipping address has been set.
-		if (!isset($this->session->data['shipping_address'])) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
+        // Validate if shipping address has been set.
+        if (!isset($this->session->data['shipping_address'])) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
 
-		// Validate cart has products and has stock.
-		if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
-			$json['redirect'] = $this->url->link('checkout/cart');
-		}
+        // Validate cart has products and has stock.
+        if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+            $json['redirect'] = $this->url->link('checkout/cart');
+        }
 
-		// Validate minimum quantity requirements.
-		$products = $this->cart->getProducts();
+        // Validate minimum quantity requirements.
+        $products = $this->cart->getProducts();
 
-		foreach ($products as $product) {
-			$product_total = 0;
+        foreach ($products as $product) {
+            $product_total = 0;
 
-			foreach ($products as $product_2) {
-				if ($product_2['product_id'] == $product['product_id']) {
-					$product_total += $product_2['quantity'];
-				}
-			}
+            foreach ($products as $product_2) {
+                if ($product_2['product_id'] == $product['product_id']) {
+                    $product_total += $product_2['quantity'];
+                }
+            }
 
-			if ($product['minimum'] > $product_total) {
-				$json['redirect'] = $this->url->link('checkout/cart');
+            if ($product['minimum'] > $product_total) {
+                $json['redirect'] = $this->url->link('checkout/cart');
 
-				break;
-			}
-		}
-
-		if (!isset($this->request->post['shipping_method'])) {
-			$json['error']['warning'] = $this->language->get('error_shipping');
-		} else {
-			$shipping = explode('.', $this->request->post['shipping_method']);
-
-			if (!isset($shipping[0]) || !isset($shipping[1]) || !isset($this->session->data['shipping_methods'][$shipping[0]]['quote'][$shipping[1]])) {
-				$json['error']['warning'] = $this->language->get('error_shipping');
-			}
-		}
-
-		if (!$json) {
-			$this->session->data['shipping_method'] = $this->session->data['shipping_methods'][$shipping[0]]['quote'][$shipping[1]];
+                break;
+            }
+        }
+
+        if (!isset($this->request->post['shipping_method'])) {
+            $json['error']['warning'] = $this->language->get('error_shipping');
+        } else {
+            $shipping = explode('.', $this->request->post['shipping_method']);
+
+            if (!isset($shipping[0]) || !isset($shipping[1]) || !isset($this->session->data['shipping_methods'][$shipping[0]]['quote'][$shipping[1]])) {
+                $json['error']['warning'] = $this->language->get('error_shipping');
+            }
+        }
+
+        if (!$json) {
+            $this->session->data['shipping_method'] = $this->session->data['shipping_methods'][$shipping[0]]['quote'][$shipping[1]];
 
-			$this->session->data['comment'] = strip_tags($this->request->post['comment']);
-		}
+            $this->session->data['comment'] = strip_tags($this->request->post['comment']);
+        }
 
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -109,9 +109,11 @@
 		}
 
 		// Validate cart has products and has stock.
-		if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+		if (!$this->cart->hasProducts()) {
+		    || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
 			$json['redirect'] = $this->url->link('checkout/cart');
 		}
+		}
 
 		// Validate minimum quantity requirements.
 		$products = $this->cart->getProducts();

application/controller/checkout/checkout.php

Indentation +123 added lines, -123 removed lines

@@ -21,141 +21,141 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 class ControllerCheckoutCheckout extends \Sunrise\Engine\Core\Controller {
-	public function index() {
-		// Validate cart has products and has stock.
-		if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
-			$this->response->redirect($this->url->link('checkout/cart'));
-		}
+    public function index() {
+        // Validate cart has products and has stock.
+        if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+            $this->response->redirect($this->url->link('checkout/cart'));
+        }
 
-		// Validate minimum quantity requirements.
-		$products = $this->cart->getProducts();
+        // Validate minimum quantity requirements.
+        $products = $this->cart->getProducts();
 
-		foreach ($products as $product) {
-			$product_total = 0;
+        foreach ($products as $product) {
+            $product_total = 0;
 
-			foreach ($products as $product_2) {
-				if ($product_2['product_id'] == $product['product_id']) {
-					$product_total += $product_2['quantity'];
-				}
-			}
+            foreach ($products as $product_2) {
+                if ($product_2['product_id'] == $product['product_id']) {
+                    $product_total += $product_2['quantity'];
+                }
+            }
 
-			if ($product['minimum'] > $product_total) {
-				$this->response->redirect($this->url->link('checkout/cart'));
-			}
-		}
+            if ($product['minimum'] > $product_total) {
+                $this->response->redirect($this->url->link('checkout/cart'));
+            }
+        }
 
-		$this->load->language('checkout/checkout');
+        $this->load->language('checkout/checkout');
 
-		$this->document->setTitle($this->language->get('heading_title'));
+        $this->document->setTitle($this->language->get('heading_title'));
 
-		$data['breadcrumbs'] = array();
+        $data['breadcrumbs'] = array();
 
-		$data['breadcrumbs'][] = array(
-			'text' => $this->language->get('text_home'),
-			'href' => $this->url->link('common/home')
-		);
+        $data['breadcrumbs'][] = array(
+            'text' => $this->language->get('text_home'),
+            'href' => $this->url->link('common/home')
+        );
 
-		$data['breadcrumbs'][] = array(
-			'text' => $this->language->get('text_cart'),
-			'href' => $this->url->link('checkout/cart')
-		);
+        $data['breadcrumbs'][] = array(
+            'text' => $this->language->get('text_cart'),
+            'href' => $this->url->link('checkout/cart')
+        );
 
-		$data['breadcrumbs'][] = array(
-			'text' => $this->language->get('heading_title'),
-			'href' => $this->url->link('checkout/checkout', '', true)
-		);
+        $data['breadcrumbs'][] = array(
+            'text' => $this->language->get('heading_title'),
+            'href' => $this->url->link('checkout/checkout', '', true)
+        );
 
-		$data['heading_title'] = $this->language->get('heading_title');
+        $data['heading_title'] = $this->language->get('heading_title');
 
-		$data['text_checkout_option'] = sprintf($this->language->get('text_checkout_option'), 1);
-		$data['text_checkout_account'] = sprintf($this->language->get('text_checkout_account'), 2);
-		$data['text_checkout_payment_address'] = sprintf($this->language->get('text_checkout_payment_address'), 2);
-		$data['text_checkout_shipping_address'] = sprintf($this->language->get('text_checkout_shipping_address'), 3);
-		$data['text_checkout_shipping_method'] = sprintf($this->language->get('text_checkout_shipping_method'), 4);
+        $data['text_checkout_option'] = sprintf($this->language->get('text_checkout_option'), 1);
+        $data['text_checkout_account'] = sprintf($this->language->get('text_checkout_account'), 2);
+        $data['text_checkout_payment_address'] = sprintf($this->language->get('text_checkout_payment_address'), 2);
+        $data['text_checkout_shipping_address'] = sprintf($this->language->get('text_checkout_shipping_address'), 3);
+        $data['text_checkout_shipping_method'] = sprintf($this->language->get('text_checkout_shipping_method'), 4);
 		
-		if ($this->cart->hasShipping()) {
-			$data['text_checkout_payment_method'] = sprintf($this->language->get('text_checkout_payment_method'), 5);
-			$data['text_checkout_confirm'] = sprintf($this->language->get('text_checkout_confirm'), 6);
-		} else {
-			$data['text_checkout_payment_method'] = sprintf($this->language->get('text_checkout_payment_method'), 3);
-			$data['text_checkout_confirm'] = sprintf($this->language->get('text_checkout_confirm'), 4);	
-		}
-
-		if (isset($this->session->data['error'])) {
-			$data['error_warning'] = $this->session->data['error'];
-			unset($this->session->data['error']);
-		} else {
-			$data['error_warning'] = '';
-		}
-
-		$data['logged'] = $this->customer->isLogged();
-
-		if (isset($this->session->data['account'])) {
-			$data['account'] = $this->session->data['account'];
-		} else {
-			$data['account'] = '';
-		}
-
-		$data['shipping_required'] = $this->cart->hasShipping();
-
-		$data['column'] = $this->load->controller('common/column');
+        if ($this->cart->hasShipping()) {
+            $data['text_checkout_payment_method'] = sprintf($this->language->get('text_checkout_payment_method'), 5);
+            $data['text_checkout_confirm'] = sprintf($this->language->get('text_checkout_confirm'), 6);
+        } else {
+            $data['text_checkout_payment_method'] = sprintf($this->language->get('text_checkout_payment_method'), 3);
+            $data['text_checkout_confirm'] = sprintf($this->language->get('text_checkout_confirm'), 4);	
+        }
+
+        if (isset($this->session->data['error'])) {
+            $data['error_warning'] = $this->session->data['error'];
+            unset($this->session->data['error']);
+        } else {
+            $data['error_warning'] = '';
+        }
+
+        $data['logged'] = $this->customer->isLogged();
+
+        if (isset($this->session->data['account'])) {
+            $data['account'] = $this->session->data['account'];
+        } else {
+            $data['account'] = '';
+        }
+
+        $data['shipping_required'] = $this->cart->hasShipping();
+
+        $data['column'] = $this->load->controller('common/column');
 		
-		$data['content_top'] = $this->load->controller('common/content_top');
-		$data['content_bottom'] = $this->load->controller('common/content_bottom');
-		$data['footer'] = $this->load->controller('common/footer');
-		$data['header'] = $this->load->controller('common/header');
-
-		$this->response->setOutput($this->load->view('checkout/checkout', $data));
-	}
-
-	public function country() {
-		$json = array();
-
-		$this->load->model('localisation/country');
-
-		$country_info = $this->model_localisation_country->getCountry($this->request->get['country_id']);
-
-		if ($country_info) {
-			$this->load->model('localisation/zone');
-
-			$json = array(
-				'country_id'        => $country_info['country_id'],
-				'name'              => $country_info['name'],
-				'iso_code_2'        => $country_info['iso_code_2'],
-				'iso_code_3'        => $country_info['iso_code_3'],
-				'address_format'    => $country_info['address_format'],
-				'postcode_required' => $country_info['postcode_required'],
-				'zone'              => $this->model_localisation_zone->getZonesByCountryId($this->request->get['country_id']),
-				'status'            => $country_info['status']
-			);
-		}
-
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
-
-	public function customfield() {
-		$json = array();
-
-		$this->load->model('account/custom_field');
-
-		// Customer Group
-		if (isset($this->request->get['customer_group_id']) && is_array($this->config->get('config_customer_group_display')) && in_array($this->request->get['customer_group_id'], $this->config->get('config_customer_group_display'))) {
-			$customer_group_id = $this->request->get['customer_group_id'];
-		} else {
-			$customer_group_id = $this->config->get('config_customer_group_id');
-		}
-
-		$custom_fields = $this->model_account_custom_field->getCustomFields($customer_group_id);
-
-		foreach ($custom_fields as $custom_field) {
-			$json[] = array(
-				'custom_field_id' => $custom_field['custom_field_id'],
-				'required'        => $custom_field['required']
-			);
-		}
-
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
+        $data['content_top'] = $this->load->controller('common/content_top');
+        $data['content_bottom'] = $this->load->controller('common/content_bottom');
+        $data['footer'] = $this->load->controller('common/footer');
+        $data['header'] = $this->load->controller('common/header');
+
+        $this->response->setOutput($this->load->view('checkout/checkout', $data));
+    }
+
+    public function country() {
+        $json = array();
+
+        $this->load->model('localisation/country');
+
+        $country_info = $this->model_localisation_country->getCountry($this->request->get['country_id']);
+
+        if ($country_info) {
+            $this->load->model('localisation/zone');
+
+            $json = array(
+                'country_id'        => $country_info['country_id'],
+                'name'              => $country_info['name'],
+                'iso_code_2'        => $country_info['iso_code_2'],
+                'iso_code_3'        => $country_info['iso_code_3'],
+                'address_format'    => $country_info['address_format'],
+                'postcode_required' => $country_info['postcode_required'],
+                'zone'              => $this->model_localisation_zone->getZonesByCountryId($this->request->get['country_id']),
+                'status'            => $country_info['status']
+            );
+        }
+
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
+
+    public function customfield() {
+        $json = array();
+
+        $this->load->model('account/custom_field');
+
+        // Customer Group
+        if (isset($this->request->get['customer_group_id']) && is_array($this->config->get('config_customer_group_display')) && in_array($this->request->get['customer_group_id'], $this->config->get('config_customer_group_display'))) {
+            $customer_group_id = $this->request->get['customer_group_id'];
+        } else {
+            $customer_group_id = $this->config->get('config_customer_group_id');
+        }
+
+        $custom_fields = $this->model_account_custom_field->getCustomFields($customer_group_id);
+
+        foreach ($custom_fields as $custom_field) {
+            $json[] = array(
+                'custom_field_id' => $custom_field['custom_field_id'],
+                'required'        => $custom_field['required']
+            );
+        }
+
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
 }

Braces +3 added lines, -1 removed lines

@@ -23,9 +23,11 @@
 class ControllerCheckoutCheckout extends \Sunrise\Engine\Core\Controller {
 	public function index() {
 		// Validate cart has products and has stock.
-		if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+		if (!$this->cart->hasProducts()) {
+		    || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
 			$this->response->redirect($this->url->link('checkout/cart'));
 		}
+		}
 
 		// Validate minimum quantity requirements.
 		$products = $this->cart->getProducts();

application/controller/checkout/register.php

Indentation +210 added lines, -210 removed lines

@@ -21,257 +21,257 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 class ControllerCheckoutRegister extends \Sunrise\Engine\Core\Controller {
-	public function index() {
-		$this->load->language('checkout/checkout');
-
-		$data['text_checkout_payment_address'] = $this->language->get('text_checkout_payment_address');
-		$data['text_your_details'] = $this->language->get('text_your_details');
-		$data['text_your_address'] = $this->language->get('text_your_address');
-		$data['text_your_password'] = $this->language->get('text_your_password');
-		$data['text_select'] = $this->language->get('text_select');
-		$data['text_none'] = $this->language->get('text_none');
-		$data['text_loading'] = $this->language->get('text_loading');
-
-		$data['entry_customer_group'] = $this->language->get('entry_customer_group');
-		$data['entry_firstname'] = $this->language->get('entry_firstname');
-		$data['entry_lastname'] = $this->language->get('entry_lastname');
-		$data['entry_email'] = $this->language->get('entry_email');
-		$data['entry_telephone'] = $this->language->get('entry_telephone');
-		$data['entry_fax'] = $this->language->get('entry_fax');
-		$data['entry_company'] = $this->language->get('entry_company');
-		$data['entry_address_1'] = $this->language->get('entry_address_1');
-		$data['entry_address_2'] = $this->language->get('entry_address_2');
-		$data['entry_postcode'] = $this->language->get('entry_postcode');
-		$data['entry_city'] = $this->language->get('entry_city');
-		$data['entry_country'] = $this->language->get('entry_country');
-		$data['entry_zone'] = $this->language->get('entry_zone');
-		$data['entry_newsletter'] = sprintf($this->language->get('entry_newsletter'), $this->config->get('config_name'));
-		$data['entry_password'] = $this->language->get('entry_password');
-		$data['entry_confirm'] = $this->language->get('entry_confirm');
-		$data['entry_shipping'] = $this->language->get('entry_shipping');
-
-		$data['button_continue'] = $this->language->get('button_continue');
-		$data['button_upload'] = $this->language->get('button_upload');
-
-		$data['customer_groups'] = array();
-
-		if (is_array($this->config->get('config_customer_group_display'))) {
-			$this->load->model('account/customer_group');
-
-			$customer_groups = $this->model_account_customer_group->getCustomerGroups();
-
-			foreach ($customer_groups  as $customer_group) {
-				if (in_array($customer_group['customer_group_id'], $this->config->get('config_customer_group_display'))) {
-					$data['customer_groups'][] = $customer_group;
-				}
-			}
-		}
-
-		$data['customer_group_id'] = $this->config->get('config_customer_group_id');
-
-		if (isset($this->session->data['shipping_address']['postcode'])) {
-			$data['postcode'] = $this->session->data['shipping_address']['postcode'];
-		} else {
-			$data['postcode'] = '';
-		}
-
-		if (isset($this->session->data['shipping_address']['country_id'])) {
-			$data['country_id'] = $this->session->data['shipping_address']['country_id'];
-		} else {
-			$data['country_id'] = $this->config->get('config_country_id');
-		}
-
-		if (isset($this->session->data['shipping_address']['zone_id'])) {
-			$data['zone_id'] = $this->session->data['shipping_address']['zone_id'];
-		} else {
-			$data['zone_id'] = '';
-		}
-
-		$this->load->model('localisation/country');
-
-		$data['countries'] = $this->model_localisation_country->getCountries();
-
-		// Custom Fields
-		$this->load->model('account/custom_field');
-
-		$data['custom_fields'] = $this->model_account_custom_field->getCustomFields();
+    public function index() {
+        $this->load->language('checkout/checkout');
+
+        $data['text_checkout_payment_address'] = $this->language->get('text_checkout_payment_address');
+        $data['text_your_details'] = $this->language->get('text_your_details');
+        $data['text_your_address'] = $this->language->get('text_your_address');
+        $data['text_your_password'] = $this->language->get('text_your_password');
+        $data['text_select'] = $this->language->get('text_select');
+        $data['text_none'] = $this->language->get('text_none');
+        $data['text_loading'] = $this->language->get('text_loading');
+
+        $data['entry_customer_group'] = $this->language->get('entry_customer_group');
+        $data['entry_firstname'] = $this->language->get('entry_firstname');
+        $data['entry_lastname'] = $this->language->get('entry_lastname');
+        $data['entry_email'] = $this->language->get('entry_email');
+        $data['entry_telephone'] = $this->language->get('entry_telephone');
+        $data['entry_fax'] = $this->language->get('entry_fax');
+        $data['entry_company'] = $this->language->get('entry_company');
+        $data['entry_address_1'] = $this->language->get('entry_address_1');
+        $data['entry_address_2'] = $this->language->get('entry_address_2');
+        $data['entry_postcode'] = $this->language->get('entry_postcode');
+        $data['entry_city'] = $this->language->get('entry_city');
+        $data['entry_country'] = $this->language->get('entry_country');
+        $data['entry_zone'] = $this->language->get('entry_zone');
+        $data['entry_newsletter'] = sprintf($this->language->get('entry_newsletter'), $this->config->get('config_name'));
+        $data['entry_password'] = $this->language->get('entry_password');
+        $data['entry_confirm'] = $this->language->get('entry_confirm');
+        $data['entry_shipping'] = $this->language->get('entry_shipping');
+
+        $data['button_continue'] = $this->language->get('button_continue');
+        $data['button_upload'] = $this->language->get('button_upload');
+
+        $data['customer_groups'] = array();
+
+        if (is_array($this->config->get('config_customer_group_display'))) {
+            $this->load->model('account/customer_group');
+
+            $customer_groups = $this->model_account_customer_group->getCustomerGroups();
+
+            foreach ($customer_groups  as $customer_group) {
+                if (in_array($customer_group['customer_group_id'], $this->config->get('config_customer_group_display'))) {
+                    $data['customer_groups'][] = $customer_group;
+                }
+            }
+        }
+
+        $data['customer_group_id'] = $this->config->get('config_customer_group_id');
+
+        if (isset($this->session->data['shipping_address']['postcode'])) {
+            $data['postcode'] = $this->session->data['shipping_address']['postcode'];
+        } else {
+            $data['postcode'] = '';
+        }
+
+        if (isset($this->session->data['shipping_address']['country_id'])) {
+            $data['country_id'] = $this->session->data['shipping_address']['country_id'];
+        } else {
+            $data['country_id'] = $this->config->get('config_country_id');
+        }
+
+        if (isset($this->session->data['shipping_address']['zone_id'])) {
+            $data['zone_id'] = $this->session->data['shipping_address']['zone_id'];
+        } else {
+            $data['zone_id'] = '';
+        }
+
+        $this->load->model('localisation/country');
+
+        $data['countries'] = $this->model_localisation_country->getCountries();
+
+        // Custom Fields
+        $this->load->model('account/custom_field');
+
+        $data['custom_fields'] = $this->model_account_custom_field->getCustomFields();
 
-		if ($this->config->get('config_account_id')) {
-			$this->load->model('catalog/information');
-
-			$information_info = $this->model_catalog_information->getInformation($this->config->get('config_account_id'));
-
-			if ($information_info) {
-				$data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information/agree', 'information_id=' . $this->config->get('config_account_id'), true), $information_info['title'], $information_info['title']);
-			} else {
-				$data['text_agree'] = '';
-			}
-		} else {
-			$data['text_agree'] = '';
-		}
+        if ($this->config->get('config_account_id')) {
+            $this->load->model('catalog/information');
+
+            $information_info = $this->model_catalog_information->getInformation($this->config->get('config_account_id'));
+
+            if ($information_info) {
+                $data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information/agree', 'information_id=' . $this->config->get('config_account_id'), true), $information_info['title'], $information_info['title']);
+            } else {
+                $data['text_agree'] = '';
+            }
+        } else {
+            $data['text_agree'] = '';
+        }
 
-		$data['shipping_required'] = $this->cart->hasShipping();
+        $data['shipping_required'] = $this->cart->hasShipping();
 
-		$this->response->setOutput($this->load->view('checkout/register', $data));
-	}
+        $this->response->setOutput($this->load->view('checkout/register', $data));
+    }
 
-	public function save() {
-		$this->load->language('checkout/checkout');
-
-		$json = array();
-
-		// Validate if customer is already logged out.
-		if ($this->customer->isLogged()) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
-
-		// Validate cart has products and has stock.
-		if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
-			$json['redirect'] = $this->url->link('checkout/cart');
-		}
+    public function save() {
+        $this->load->language('checkout/checkout');
+
+        $json = array();
+
+        // Validate if customer is already logged out.
+        if ($this->customer->isLogged()) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
+
+        // Validate cart has products and has stock.
+        if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+            $json['redirect'] = $this->url->link('checkout/cart');
+        }
 
-		// Validate minimum quantity requirements.
-		$products = $this->cart->getProducts();
-
-		foreach ($products as $product) {
-			$product_total = 0;
+        // Validate minimum quantity requirements.
+        $products = $this->cart->getProducts();
+
+        foreach ($products as $product) {
+            $product_total = 0;
 
-			foreach ($products as $product_2) {
-				if ($product_2['product_id'] == $product['product_id']) {
-					$product_total += $product_2['quantity'];
-				}
-			}
+            foreach ($products as $product_2) {
+                if ($product_2['product_id'] == $product['product_id']) {
+                    $product_total += $product_2['quantity'];
+                }
+            }
 
-			if ($product['minimum'] > $product_total) {
-				$json['redirect'] = $this->url->link('checkout/cart');
+            if ($product['minimum'] > $product_total) {
+                $json['redirect'] = $this->url->link('checkout/cart');
 
-				break;
-			}
-		}
+                break;
+            }
+        }
 
-		if (!$json) {
-			$this->load->model('account/customer');
+        if (!$json) {
+            $this->load->model('account/customer');
 
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) > 32)) {
-				$json['error']['firstname'] = $this->language->get('error_firstname');
-			}
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) > 32)) {
+                $json['error']['firstname'] = $this->language->get('error_firstname');
+            }
 
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) > 32)) {
-				$json['error']['lastname'] = $this->language->get('error_lastname');
-			}
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) > 32)) {
+                $json['error']['lastname'] = $this->language->get('error_lastname');
+            }
 
-			if ((\voku\helper\UTF8::strlen($this->request->post['email']) > 96) || !filter_var($this->request->post['email'], FILTER_VALIDATE_EMAIL)) {
-				$json['error']['email'] = $this->language->get('error_email');
-			}
+            if ((\voku\helper\UTF8::strlen($this->request->post['email']) > 96) || !filter_var($this->request->post['email'], FILTER_VALIDATE_EMAIL)) {
+                $json['error']['email'] = $this->language->get('error_email');
+            }
 
-			if ($this->model_account_customer->getTotalCustomersByEmail($this->request->post['email'])) {
-				$json['error']['warning'] = $this->language->get('error_exists');
-			}
+            if ($this->model_account_customer->getTotalCustomersByEmail($this->request->post['email'])) {
+                $json['error']['warning'] = $this->language->get('error_exists');
+            }
 
-			if ((\voku\helper\UTF8::strlen($this->request->post['telephone']) < 3) || (\voku\helper\UTF8::strlen($this->request->post['telephone']) > 32)) {
-				$json['error']['telephone'] = $this->language->get('error_telephone');
-			}
+            if ((\voku\helper\UTF8::strlen($this->request->post['telephone']) < 3) || (\voku\helper\UTF8::strlen($this->request->post['telephone']) > 32)) {
+                $json['error']['telephone'] = $this->language->get('error_telephone');
+            }
 
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) < 3) || (\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) > 128)) {
-				$json['error']['address_1'] = $this->language->get('error_address_1');
-			}
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) < 3) || (\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) > 128)) {
+                $json['error']['address_1'] = $this->language->get('error_address_1');
+            }
 
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['city'])) < 2) || (\voku\helper\UTF8::strlen(trim($this->request->post['city'])) > 128)) {
-				$json['error']['city'] = $this->language->get('error_city');
-			}
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['city'])) < 2) || (\voku\helper\UTF8::strlen(trim($this->request->post['city'])) > 128)) {
+                $json['error']['city'] = $this->language->get('error_city');
+            }
 
-			$this->load->model('localisation/country');
+            $this->load->model('localisation/country');
 
-			$country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
+            $country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
 
-			if ($country_info && $country_info['postcode_required'] && (\voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) < 2 || \voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) > 10)) {
-				$json['error']['postcode'] = $this->language->get('error_postcode');
-			}
+            if ($country_info && $country_info['postcode_required'] && (\voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) < 2 || \voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) > 10)) {
+                $json['error']['postcode'] = $this->language->get('error_postcode');
+            }
 
-			if ($this->request->post['country_id'] == '') {
-				$json['error']['country'] = $this->language->get('error_country');
-			}
+            if ($this->request->post['country_id'] == '') {
+                $json['error']['country'] = $this->language->get('error_country');
+            }
 
-			if (!isset($this->request->post['zone_id']) || $this->request->post['zone_id'] == '' || !is_numeric($this->request->post['zone_id'])) {
-				$json['error']['zone'] = $this->language->get('error_zone');
-			}
+            if (!isset($this->request->post['zone_id']) || $this->request->post['zone_id'] == '' || !is_numeric($this->request->post['zone_id'])) {
+                $json['error']['zone'] = $this->language->get('error_zone');
+            }
 
-			if ((\voku\helper\UTF8::strlen($this->request->post['password']) < 4) || (\voku\helper\UTF8::strlen($this->request->post['password']) > 20)) {
-				$json['error']['password'] = $this->language->get('error_password');
-			}
+            if ((\voku\helper\UTF8::strlen($this->request->post['password']) < 4) || (\voku\helper\UTF8::strlen($this->request->post['password']) > 20)) {
+                $json['error']['password'] = $this->language->get('error_password');
+            }
 
-			if ($this->request->post['confirm'] != $this->request->post['password']) {
-				$json['error']['confirm'] = $this->language->get('error_confirm');
-			}
+            if ($this->request->post['confirm'] != $this->request->post['password']) {
+                $json['error']['confirm'] = $this->language->get('error_confirm');
+            }
 
-			if ($this->config->get('config_account_id')) {
-				$this->load->model('catalog/information');
+            if ($this->config->get('config_account_id')) {
+                $this->load->model('catalog/information');
 
-				$information_info = $this->model_catalog_information->getInformation($this->config->get('config_account_id'));
+                $information_info = $this->model_catalog_information->getInformation($this->config->get('config_account_id'));
 
-				if ($information_info && !isset($this->request->post['agree'])) {
-					$json['error']['warning'] = sprintf($this->language->get('error_agree'), $information_info['title']);
-				}
-			}
+                if ($information_info && !isset($this->request->post['agree'])) {
+                    $json['error']['warning'] = sprintf($this->language->get('error_agree'), $information_info['title']);
+                }
+            }
 
-			// Customer Group
-			if (isset($this->request->post['customer_group_id']) && is_array($this->config->get('config_customer_group_display')) && in_array($this->request->post['customer_group_id'], $this->config->get('config_customer_group_display'))) {
-				$customer_group_id = $this->request->post['customer_group_id'];
-			} else {
-				$customer_group_id = $this->config->get('config_customer_group_id');
-			}
+            // Customer Group
+            if (isset($this->request->post['customer_group_id']) && is_array($this->config->get('config_customer_group_display')) && in_array($this->request->post['customer_group_id'], $this->config->get('config_customer_group_display'))) {
+                $customer_group_id = $this->request->post['customer_group_id'];
+            } else {
+                $customer_group_id = $this->config->get('config_customer_group_id');
+            }
 
-			// Custom field validation
-			$this->load->model('account/custom_field');
+            // Custom field validation
+            $this->load->model('account/custom_field');
 
-			$custom_fields = $this->model_account_custom_field->getCustomFields($customer_group_id);
+            $custom_fields = $this->model_account_custom_field->getCustomFields($customer_group_id);
 
-			foreach ($custom_fields as $custom_field) {
-				if ($custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['location']][$custom_field['custom_field_id']])) {
-					$json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
-				} elseif (($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['location']][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
-					$json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
-				}
-			}
+            foreach ($custom_fields as $custom_field) {
+                if ($custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['location']][$custom_field['custom_field_id']])) {
+                    $json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
+                } elseif (($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['location']][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
+                    $json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
+                }
+            }
 
-		}
+        }
 
-		if (!$json) {
-			$customer_id = $this->model_account_customer->addCustomer($this->request->post);
+        if (!$json) {
+            $customer_id = $this->model_account_customer->addCustomer($this->request->post);
 
-			// Clear any previous login attempts for unregistered accounts.
-			$this->model_account_customer->deleteLoginAttempts($this->request->post['email']);
+            // Clear any previous login attempts for unregistered accounts.
+            $this->model_account_customer->deleteLoginAttempts($this->request->post['email']);
 
-			$this->session->data['account'] = 'register';
+            $this->session->data['account'] = 'register';
 
-			$this->load->model('account/customer_group');
+            $this->load->model('account/customer_group');
 
-			$customer_group_info = $this->model_account_customer_group->getCustomerGroup($customer_group_id);
+            $customer_group_info = $this->model_account_customer_group->getCustomerGroup($customer_group_id);
 
-			if ($customer_group_info && !$customer_group_info['approval']) {
-				$this->customer->login($this->request->post['email'], $this->request->post['password']);
+            if ($customer_group_info && !$customer_group_info['approval']) {
+                $this->customer->login($this->request->post['email'], $this->request->post['password']);
 
-				// Default Payment Address
-				$this->load->model('account/address');
+                // Default Payment Address
+                $this->load->model('account/address');
 
-				$this->session->data['payment_address'] = $this->model_account_address->getAddress($this->customer->getAddressId());
+                $this->session->data['payment_address'] = $this->model_account_address->getAddress($this->customer->getAddressId());
 
-				if (!empty($this->request->post['shipping_address'])) {
-					$this->session->data['shipping_address'] = $this->model_account_address->getAddress($this->customer->getAddressId());
-				}
-			} else {
-				$json['redirect'] = $this->url->link('account/success');
-			}
+                if (!empty($this->request->post['shipping_address'])) {
+                    $this->session->data['shipping_address'] = $this->model_account_address->getAddress($this->customer->getAddressId());
+                }
+            } else {
+                $json['redirect'] = $this->url->link('account/success');
+            }
 
-			unset($this->session->data['guest']);
-			unset($this->session->data['shipping_method']);
-			unset($this->session->data['shipping_methods']);
-			unset($this->session->data['payment_method']);
-			unset($this->session->data['payment_methods']);
+            unset($this->session->data['guest']);
+            unset($this->session->data['shipping_method']);
+            unset($this->session->data['shipping_methods']);
+            unset($this->session->data['payment_method']);
+            unset($this->session->data['payment_methods']);
 
-		}
+        }
 
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
 }

application/controller/checkout/success.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
     {
         $this->load->language('checkout/success');
         
-        if (isset($this->session->data['order_id']) && (! empty($this->session->data['order_id']))) {
+        if (isset($this->session->data['order_id']) && (!empty($this->session->data['order_id']))) {
             $this->session->data['last_order_id'] = $this->session->data['order_id'];
         }
 
@@ -44,7 +44,7 @@ 
             unset($this->session->data['totals']);
         }
 
-        if (! empty($this->session->data['last_order_id'])) {
+        if (!empty($this->session->data['last_order_id'])) {
             $this->document->setTitle(sprintf($this->language->get('heading_title_customer'), $this->session->data['last_order_id']));
         } else {
             $this->document->setTitle($this->language->get('heading_title'));
@@ -72,7 +72,7 @@ 
             'href' => $this->url->link('checkout/success')
         );
 
-        if (! empty($this->session->data['last_order_id'])) {
+        if (!empty($this->session->data['last_order_id'])) {
             $data['heading_title'] = sprintf($this->language->get('heading_title_customer'), $this->session->data['last_order_id']);
         } else {
             $data['heading_title'] = $this->language->get('heading_title');

application/controller/checkout/guest_shipping.php

Indentation +204 added lines, -204 removed lines

@@ -21,215 +21,215 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 class ControllerCheckoutGuestShipping extends \Sunrise\Core\Engine\Controller {
-	public function index() {
-		$this->load->language('checkout/checkout');
-
-		$data['text_select'] = $this->language->get('text_select');
-		$data['text_none'] = $this->language->get('text_none');
-		$data['text_loading'] = $this->language->get('text_loading');
-
-		$data['entry_firstname'] = $this->language->get('entry_firstname');
-		$data['entry_lastname'] = $this->language->get('entry_lastname');
-		$data['entry_company'] = $this->language->get('entry_company');
-		$data['entry_address_1'] = $this->language->get('entry_address_1');
-		$data['entry_address_2'] = $this->language->get('entry_address_2');
-		$data['entry_postcode'] = $this->language->get('entry_postcode');
-		$data['entry_city'] = $this->language->get('entry_city');
-		$data['entry_country'] = $this->language->get('entry_country');
-		$data['entry_zone'] = $this->language->get('entry_zone');
-
-		$data['button_continue'] = $this->language->get('button_continue');
-		$data['button_upload'] = $this->language->get('button_upload');
-
-		if (isset($this->session->data['shipping_address']['firstname'])) {
-			$data['firstname'] = $this->session->data['shipping_address']['firstname'];
-		} else {
-			$data['firstname'] = '';
-		}
-
-		if (isset($this->session->data['shipping_address']['lastname'])) {
-			$data['lastname'] = $this->session->data['shipping_address']['lastname'];
-		} else {
-			$data['lastname'] = '';
-		}
-
-		if (isset($this->session->data['shipping_address']['company'])) {
-			$data['company'] = $this->session->data['shipping_address']['company'];
-		} else {
-			$data['company'] = '';
-		}
-
-		if (isset($this->session->data['shipping_address']['address_1'])) {
-			$data['address_1'] = $this->session->data['shipping_address']['address_1'];
-		} else {
-			$data['address_1'] = '';
-		}
-
-		if (isset($this->session->data['shipping_address']['address_2'])) {
-			$data['address_2'] = $this->session->data['shipping_address']['address_2'];
-		} else {
-			$data['address_2'] = '';
-		}
-
-		if (isset($this->session->data['shipping_address']['postcode'])) {
-			$data['postcode'] = $this->session->data['shipping_address']['postcode'];
-		} else {
-			$data['postcode'] = '';
-		}
-
-		if (isset($this->session->data['shipping_address']['city'])) {
-			$data['city'] = $this->session->data['shipping_address']['city'];
-		} else {
-			$data['city'] = '';
-		}
-
-		if (isset($this->session->data['shipping_address']['country_id'])) {
-			$data['country_id'] = $this->session->data['shipping_address']['country_id'];
-		} else {
-			$data['country_id'] = $this->config->get('config_country_id');
-		}
-
-		if (isset($this->session->data['shipping_address']['zone_id'])) {
-			$data['zone_id'] = $this->session->data['shipping_address']['zone_id'];
-		} else {
-			$data['zone_id'] = '';
-		}
-
-		$this->load->model('localisation/country');
-
-		$data['countries'] = $this->model_localisation_country->getCountries();
-
-		// Custom Fields
-		$this->load->model('account/custom_field');
-
-		$data['custom_fields'] = $this->model_account_custom_field->getCustomFields($this->session->data['guest']['customer_group_id']);
-
-		if (isset($this->session->data['shipping_address']['custom_field'])) {
-			$data['address_custom_field'] = $this->session->data['shipping_address']['custom_field'];
-		} else {
-			$data['address_custom_field'] = array();
-		}
-
-		$this->response->setOutput($this->load->view('checkout/guest_shipping', $data));
-	}
-
-	public function save() {
-		$this->load->language('checkout/checkout');
-
-		$json = array();
-
-		// Validate if customer is logged in.
-		if ($this->customer->isLogged()) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
-
-		// Validate cart has products and has stock.
-		if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
-			$json['redirect'] = $this->url->link('checkout/cart');
-		}
-
-		// Check if guest checkout is available.
-		if (!$this->config->get('config_checkout_guest') || $this->config->get('config_customer_price') || $this->cart->hasDownload()) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
-
-		if (!$json) {
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) > 32)) {
-				$json['error']['firstname'] = $this->language->get('error_firstname');
-			}
-
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) > 32)) {
-				$json['error']['lastname'] = $this->language->get('error_lastname');
-			}
-
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) < 3) || (\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) > 128)) {
-				$json['error']['address_1'] = $this->language->get('error_address_1');
-			}
-
-			if ((\voku\helper\UTF8::strlen(trim($this->request->post['city'])) < 2) || (\voku\helper\UTF8::strlen(trim($this->request->post['city'])) > 128)) {
-				$json['error']['city'] = $this->language->get('error_city');
-			}
-
-			$this->load->model('localisation/country');
-
-			$country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
-
-			if ($country_info && $country_info['postcode_required'] && (\voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) < 2 || \voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) > 10)) {
-				$json['error']['postcode'] = $this->language->get('error_postcode');
-			}
+    public function index() {
+        $this->load->language('checkout/checkout');
+
+        $data['text_select'] = $this->language->get('text_select');
+        $data['text_none'] = $this->language->get('text_none');
+        $data['text_loading'] = $this->language->get('text_loading');
+
+        $data['entry_firstname'] = $this->language->get('entry_firstname');
+        $data['entry_lastname'] = $this->language->get('entry_lastname');
+        $data['entry_company'] = $this->language->get('entry_company');
+        $data['entry_address_1'] = $this->language->get('entry_address_1');
+        $data['entry_address_2'] = $this->language->get('entry_address_2');
+        $data['entry_postcode'] = $this->language->get('entry_postcode');
+        $data['entry_city'] = $this->language->get('entry_city');
+        $data['entry_country'] = $this->language->get('entry_country');
+        $data['entry_zone'] = $this->language->get('entry_zone');
+
+        $data['button_continue'] = $this->language->get('button_continue');
+        $data['button_upload'] = $this->language->get('button_upload');
+
+        if (isset($this->session->data['shipping_address']['firstname'])) {
+            $data['firstname'] = $this->session->data['shipping_address']['firstname'];
+        } else {
+            $data['firstname'] = '';
+        }
+
+        if (isset($this->session->data['shipping_address']['lastname'])) {
+            $data['lastname'] = $this->session->data['shipping_address']['lastname'];
+        } else {
+            $data['lastname'] = '';
+        }
+
+        if (isset($this->session->data['shipping_address']['company'])) {
+            $data['company'] = $this->session->data['shipping_address']['company'];
+        } else {
+            $data['company'] = '';
+        }
+
+        if (isset($this->session->data['shipping_address']['address_1'])) {
+            $data['address_1'] = $this->session->data['shipping_address']['address_1'];
+        } else {
+            $data['address_1'] = '';
+        }
+
+        if (isset($this->session->data['shipping_address']['address_2'])) {
+            $data['address_2'] = $this->session->data['shipping_address']['address_2'];
+        } else {
+            $data['address_2'] = '';
+        }
+
+        if (isset($this->session->data['shipping_address']['postcode'])) {
+            $data['postcode'] = $this->session->data['shipping_address']['postcode'];
+        } else {
+            $data['postcode'] = '';
+        }
+
+        if (isset($this->session->data['shipping_address']['city'])) {
+            $data['city'] = $this->session->data['shipping_address']['city'];
+        } else {
+            $data['city'] = '';
+        }
+
+        if (isset($this->session->data['shipping_address']['country_id'])) {
+            $data['country_id'] = $this->session->data['shipping_address']['country_id'];
+        } else {
+            $data['country_id'] = $this->config->get('config_country_id');
+        }
+
+        if (isset($this->session->data['shipping_address']['zone_id'])) {
+            $data['zone_id'] = $this->session->data['shipping_address']['zone_id'];
+        } else {
+            $data['zone_id'] = '';
+        }
+
+        $this->load->model('localisation/country');
+
+        $data['countries'] = $this->model_localisation_country->getCountries();
+
+        // Custom Fields
+        $this->load->model('account/custom_field');
+
+        $data['custom_fields'] = $this->model_account_custom_field->getCustomFields($this->session->data['guest']['customer_group_id']);
+
+        if (isset($this->session->data['shipping_address']['custom_field'])) {
+            $data['address_custom_field'] = $this->session->data['shipping_address']['custom_field'];
+        } else {
+            $data['address_custom_field'] = array();
+        }
+
+        $this->response->setOutput($this->load->view('checkout/guest_shipping', $data));
+    }
+
+    public function save() {
+        $this->load->language('checkout/checkout');
+
+        $json = array();
+
+        // Validate if customer is logged in.
+        if ($this->customer->isLogged()) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
+
+        // Validate cart has products and has stock.
+        if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+            $json['redirect'] = $this->url->link('checkout/cart');
+        }
+
+        // Check if guest checkout is available.
+        if (!$this->config->get('config_checkout_guest') || $this->config->get('config_customer_price') || $this->cart->hasDownload()) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
+
+        if (!$json) {
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['firstname'])) > 32)) {
+                $json['error']['firstname'] = $this->language->get('error_firstname');
+            }
+
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) < 1) || (\voku\helper\UTF8::strlen(trim($this->request->post['lastname'])) > 32)) {
+                $json['error']['lastname'] = $this->language->get('error_lastname');
+            }
+
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) < 3) || (\voku\helper\UTF8::strlen(trim($this->request->post['address_1'])) > 128)) {
+                $json['error']['address_1'] = $this->language->get('error_address_1');
+            }
+
+            if ((\voku\helper\UTF8::strlen(trim($this->request->post['city'])) < 2) || (\voku\helper\UTF8::strlen(trim($this->request->post['city'])) > 128)) {
+                $json['error']['city'] = $this->language->get('error_city');
+            }
+
+            $this->load->model('localisation/country');
 
-			if ($this->request->post['country_id'] == '') {
-				$json['error']['country'] = $this->language->get('error_country');
-			}
+            $country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
+
+            if ($country_info && $country_info['postcode_required'] && (\voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) < 2 || \voku\helper\UTF8::strlen(trim($this->request->post['postcode'])) > 10)) {
+                $json['error']['postcode'] = $this->language->get('error_postcode');
+            }
 
-			if (!isset($this->request->post['zone_id']) || $this->request->post['zone_id'] == '' || !is_numeric($this->request->post['zone_id'])) {
-				$json['error']['zone'] = $this->language->get('error_zone');
-			}
+            if ($this->request->post['country_id'] == '') {
+                $json['error']['country'] = $this->language->get('error_country');
+            }
 
-			// Custom field validation
-			$this->load->model('account/custom_field');
+            if (!isset($this->request->post['zone_id']) || $this->request->post['zone_id'] == '' || !is_numeric($this->request->post['zone_id'])) {
+                $json['error']['zone'] = $this->language->get('error_zone');
+            }
 
-			$custom_fields = $this->model_account_custom_field->getCustomFields($this->session->data['guest']['customer_group_id']);
+            // Custom field validation
+            $this->load->model('account/custom_field');
 
-			foreach ($custom_fields as $custom_field) {
-				if (($custom_field['location'] == 'address') && $custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['custom_field_id']])) {
-					$json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
-				} elseif (($custom_field['location'] == 'address') && ($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
+            $custom_fields = $this->model_account_custom_field->getCustomFields($this->session->data['guest']['customer_group_id']);
+
+            foreach ($custom_fields as $custom_field) {
+                if (($custom_field['location'] == 'address') && $custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['custom_field_id']])) {
+                    $json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
+                } elseif (($custom_field['location'] == 'address') && ($custom_field['type'] == 'text') && !empty($custom_field['validation']) && !filter_var($this->request->post['custom_field'][$custom_field['custom_field_id']], FILTER_VALIDATE_REGEXP, array('options' => array('regexp' => $custom_field['validation'])))) {
                     $json['error']['custom_field' . $custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
                 }
-			}
-		}
-
-		if (!$json) {
-			$this->session->data['shipping_address']['firstname'] = $this->request->post['firstname'];
-			$this->session->data['shipping_address']['lastname'] = $this->request->post['lastname'];
-			$this->session->data['shipping_address']['company'] = $this->request->post['company'];
-			$this->session->data['shipping_address']['address_1'] = $this->request->post['address_1'];
-			$this->session->data['shipping_address']['address_2'] = $this->request->post['address_2'];
-			$this->session->data['shipping_address']['postcode'] = $this->request->post['postcode'];
-			$this->session->data['shipping_address']['city'] = $this->request->post['city'];
-			$this->session->data['shipping_address']['country_id'] = $this->request->post['country_id'];
-			$this->session->data['shipping_address']['zone_id'] = $this->request->post['zone_id'];
-
-			$this->load->model('localisation/country');
-
-			$country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
-
-			if ($country_info) {
-				$this->session->data['shipping_address']['country'] = $country_info['name'];
-				$this->session->data['shipping_address']['iso_code_2'] = $country_info['iso_code_2'];
-				$this->session->data['shipping_address']['iso_code_3'] = $country_info['iso_code_3'];
-				$this->session->data['shipping_address']['address_format'] = $country_info['address_format'];
-			} else {
-				$this->session->data['shipping_address']['country'] = '';
-				$this->session->data['shipping_address']['iso_code_2'] = '';
-				$this->session->data['shipping_address']['iso_code_3'] = '';
-				$this->session->data['shipping_address']['address_format'] = '';
-			}
-
-			$this->load->model('localisation/zone');
-
-			$zone_info = $this->model_localisation_zone->getZone($this->request->post['zone_id']);
-
-			if ($zone_info) {
-				$this->session->data['shipping_address']['zone'] = $zone_info['name'];
-				$this->session->data['shipping_address']['zone_code'] = $zone_info['code'];
-			} else {
-				$this->session->data['shipping_address']['zone'] = '';
-				$this->session->data['shipping_address']['zone_code'] = '';
-			}
-
-			if (isset($this->request->post['custom_field'])) {
-				$this->session->data['shipping_address']['custom_field'] = $this->request->post['custom_field'];
-			} else {
-				$this->session->data['shipping_address']['custom_field'] = array();
-			}
-
-			unset($this->session->data['shipping_method']);
-			unset($this->session->data['shipping_methods']);
-		}
-
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
+            }
+        }
+
+        if (!$json) {
+            $this->session->data['shipping_address']['firstname'] = $this->request->post['firstname'];
+            $this->session->data['shipping_address']['lastname'] = $this->request->post['lastname'];
+            $this->session->data['shipping_address']['company'] = $this->request->post['company'];
+            $this->session->data['shipping_address']['address_1'] = $this->request->post['address_1'];
+            $this->session->data['shipping_address']['address_2'] = $this->request->post['address_2'];
+            $this->session->data['shipping_address']['postcode'] = $this->request->post['postcode'];
+            $this->session->data['shipping_address']['city'] = $this->request->post['city'];
+            $this->session->data['shipping_address']['country_id'] = $this->request->post['country_id'];
+            $this->session->data['shipping_address']['zone_id'] = $this->request->post['zone_id'];
+
+            $this->load->model('localisation/country');
+
+            $country_info = $this->model_localisation_country->getCountry($this->request->post['country_id']);
+
+            if ($country_info) {
+                $this->session->data['shipping_address']['country'] = $country_info['name'];
+                $this->session->data['shipping_address']['iso_code_2'] = $country_info['iso_code_2'];
+                $this->session->data['shipping_address']['iso_code_3'] = $country_info['iso_code_3'];
+                $this->session->data['shipping_address']['address_format'] = $country_info['address_format'];
+            } else {
+                $this->session->data['shipping_address']['country'] = '';
+                $this->session->data['shipping_address']['iso_code_2'] = '';
+                $this->session->data['shipping_address']['iso_code_3'] = '';
+                $this->session->data['shipping_address']['address_format'] = '';
+            }
+
+            $this->load->model('localisation/zone');
+
+            $zone_info = $this->model_localisation_zone->getZone($this->request->post['zone_id']);
+
+            if ($zone_info) {
+                $this->session->data['shipping_address']['zone'] = $zone_info['name'];
+                $this->session->data['shipping_address']['zone_code'] = $zone_info['code'];
+            } else {
+                $this->session->data['shipping_address']['zone'] = '';
+                $this->session->data['shipping_address']['zone_code'] = '';
+            }
+
+            if (isset($this->request->post['custom_field'])) {
+                $this->session->data['shipping_address']['custom_field'] = $this->request->post['custom_field'];
+            } else {
+                $this->session->data['shipping_address']['custom_field'] = array();
+            }
+
+            unset($this->session->data['shipping_method']);
+            unset($this->session->data['shipping_methods']);
+        }
+
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -124,9 +124,11 @@
 		}
 
 		// Validate cart has products and has stock.
-		if (!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+		if (!$this->cart->hasProducts()) {
+		    || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
 			$json['redirect'] = $this->url->link('checkout/cart');
 		}
+		}
 
 		// Check if guest checkout is available.
 		if (!$this->config->get('config_checkout_guest') || $this->config->get('config_customer_price') || $this->cart->hasDownload()) {

application/controller/checkout/login.php

Indentation +68 added lines, -68 removed lines

@@ -21,96 +21,96 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 class ControllerCheckoutLogin extends \Sunrise\Engine\Core\Controller {
-	public function index() {
-		$this->load->language('checkout/checkout');
+    public function index() {
+        $this->load->language('checkout/checkout');
 
-		$data['text_checkout_account'] = $this->language->get('text_checkout_account');
-		$data['text_checkout_payment_address'] = $this->language->get('text_checkout_payment_address');
-		$data['text_new_customer'] = $this->language->get('text_new_customer');
-		$data['text_returning_customer'] = $this->language->get('text_returning_customer');
-		$data['text_checkout'] = $this->language->get('text_checkout');
-		$data['text_register'] = $this->language->get('text_register');
-		$data['text_guest'] = $this->language->get('text_guest');
-		$data['text_i_am_returning_customer'] = $this->language->get('text_i_am_returning_customer');
-		$data['text_register_account'] = $this->language->get('text_register_account');
-		$data['text_forgotten'] = $this->language->get('text_forgotten');
-		$data['text_loading'] = $this->language->get('text_loading');
+        $data['text_checkout_account'] = $this->language->get('text_checkout_account');
+        $data['text_checkout_payment_address'] = $this->language->get('text_checkout_payment_address');
+        $data['text_new_customer'] = $this->language->get('text_new_customer');
+        $data['text_returning_customer'] = $this->language->get('text_returning_customer');
+        $data['text_checkout'] = $this->language->get('text_checkout');
+        $data['text_register'] = $this->language->get('text_register');
+        $data['text_guest'] = $this->language->get('text_guest');
+        $data['text_i_am_returning_customer'] = $this->language->get('text_i_am_returning_customer');
+        $data['text_register_account'] = $this->language->get('text_register_account');
+        $data['text_forgotten'] = $this->language->get('text_forgotten');
+        $data['text_loading'] = $this->language->get('text_loading');
 
-		$data['entry_email'] = $this->language->get('entry_email');
-		$data['entry_password'] = $this->language->get('entry_password');
+        $data['entry_email'] = $this->language->get('entry_email');
+        $data['entry_password'] = $this->language->get('entry_password');
 
-		$data['button_continue'] = $this->language->get('button_continue');
-		$data['button_login'] = $this->language->get('button_login');
+        $data['button_continue'] = $this->language->get('button_continue');
+        $data['button_login'] = $this->language->get('button_login');
 
-		$data['checkout_guest'] = ($this->config->get('config_checkout_guest') && !$this->config->get('config_customer_price') && !$this->cart->hasDownload());
+        $data['checkout_guest'] = ($this->config->get('config_checkout_guest') && !$this->config->get('config_customer_price') && !$this->cart->hasDownload());
 
-		if (isset($this->session->data['account'])) {
-			$data['account'] = $this->session->data['account'];
-		} else {
-			$data['account'] = 'register';
-		}
+        if (isset($this->session->data['account'])) {
+            $data['account'] = $this->session->data['account'];
+        } else {
+            $data['account'] = 'register';
+        }
 
-		$data['forgotten'] = $this->url->link('account/forgotten', '', true);
+        $data['forgotten'] = $this->url->link('account/forgotten', '', true);
 
-		$this->response->setOutput($this->load->view('checkout/login', $data));
-	}
+        $this->response->setOutput($this->load->view('checkout/login', $data));
+    }
 
-	public function save() {
-		$this->load->language('checkout/checkout');
+    public function save() {
+        $this->load->language('checkout/checkout');
 
-		$json = array();
+        $json = array();
 
-		if ($this->customer->isLogged()) {
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
+        if ($this->customer->isLogged()) {
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
 
-		if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
-			$json['redirect'] = $this->url->link('checkout/cart');
-		}
+        if ((!$this->cart->hasProducts()) || (!$this->cart->hasStock() && !$this->config->get('config_stock_checkout'))) {
+            $json['redirect'] = $this->url->link('checkout/cart');
+        }
 
-		if (!$json) {
-			$this->load->model('account/customer');
+        if (!$json) {
+            $this->load->model('account/customer');
 
-			// Check how many login attempts have been made.
-			$login_info = $this->model_account_customer->getLoginAttempts($this->request->post['email']);
+            // Check how many login attempts have been made.
+            $login_info = $this->model_account_customer->getLoginAttempts($this->request->post['email']);
 
-			if ($login_info && ($login_info['total'] >= $this->config->get('config_login_attempts')) && strtotime('-1 hour') < strtotime($login_info['date_modified'])) {
-				$json['error']['warning'] = $this->language->get('error_attempts');
-			}
+            if ($login_info && ($login_info['total'] >= $this->config->get('config_login_attempts')) && strtotime('-1 hour') < strtotime($login_info['date_modified'])) {
+                $json['error']['warning'] = $this->language->get('error_attempts');
+            }
 
-			// Check if customer has been approved.
-			$customer_info = $this->model_account_customer->getCustomerByEmail($this->request->post['email']);
+            // Check if customer has been approved.
+            $customer_info = $this->model_account_customer->getCustomerByEmail($this->request->post['email']);
 
-			if ($customer_info && !$customer_info['approved']) {
-				$json['error']['warning'] = $this->language->get('error_approved');
-			}
+            if ($customer_info && !$customer_info['approved']) {
+                $json['error']['warning'] = $this->language->get('error_approved');
+            }
 
-			if (!isset($json['error'])) {
-				if (!$this->customer->login($this->request->post['email'], $this->request->post['password'])) {
-					$json['error']['warning'] = $this->language->get('error_login');
+            if (!isset($json['error'])) {
+                if (!$this->customer->login($this->request->post['email'], $this->request->post['password'])) {
+                    $json['error']['warning'] = $this->language->get('error_login');
 
-					$this->model_account_customer->addLoginAttempt($this->request->post['email']);
-				} else {
-					$this->model_account_customer->deleteLoginAttempts($this->request->post['email']);
-				}
-			}
-		}
+                    $this->model_account_customer->addLoginAttempt($this->request->post['email']);
+                } else {
+                    $this->model_account_customer->deleteLoginAttempts($this->request->post['email']);
+                }
+            }
+        }
 
-		if (!$json) {
-			// Unset guest
-			unset($this->session->data['guest']);
+        if (!$json) {
+            // Unset guest
+            unset($this->session->data['guest']);
 
-			// Default Shipping Address
-			$this->load->model('account/address');
+            // Default Shipping Address
+            $this->load->model('account/address');
 
-			$this->session->data['payment_address'] = $this->model_account_address->getAddress($this->customer->getAddressId());
+            $this->session->data['payment_address'] = $this->model_account_address->getAddress($this->customer->getAddressId());
 
-			$this->session->data['shipping_address'] = $this->model_account_address->getAddress($this->customer->getAddressId());
+            $this->session->data['shipping_address'] = $this->model_account_address->getAddress($this->customer->getAddressId());
 
-			$json['redirect'] = $this->url->link('checkout/checkout', '', true);
-		}
+            $json['redirect'] = $this->url->link('checkout/checkout', '', true);
+        }
 
-		$this->response->addHeader('Content-Type: application/json');
-		$this->response->setOutput(json_encode($json));
-	}
+        $this->response->addHeader('Content-Type: application/json');
+        $this->response->setOutput(json_encode($json));
+    }
 }