#1.30.25 Typo shiping_sub_option_id, renamed to shipping_sub_option_id

damanic · Sep 19, 2017 · f409df0 · f409df0
1 parent 1edf5fb
commit f409df0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/controllers/shop_orders.php b/controllers/shop_orders.php
@@ -1329,7 +1329,7 @@ protected function create_onCustomerChanged()
 
 		public function edit_formBeforeRender($model)
 		{
-			$model->shiping_sub_option_id = $model->shipping_method_id.'_'.md5($model->shipping_sub_option);
+			$model->shipping_sub_option_id = $model->shipping_method_id.'_'.md5($model->shipping_sub_option);
 			$model->manual_shipping_quote = $model->shipping_quote;
 		}
 
@@ -1902,7 +1902,7 @@ public function formBeforeSave($order, $session_key)
 			if (strpos($shipping_method_id, '_') !== false)
 			{
 				$parts = explode('_', $order->shipping_method_id);
-				$order->shiping_sub_option_id = $shipping_method_id;
+				$order->shipping_sub_option_id = $shipping_method_id;
 				$order->shipping_method_id = $parts[0];
 			}
 
@@ -1979,7 +1979,7 @@ protected function onUpdateShippingOptions($order_id)
 			if (strpos($order->shipping_method_id, '_') !== false)
 			{
 				$parts = explode('_', $order->shipping_method_id);
-				$order->shiping_sub_option_id = $order->shipping_method_id;
+				$order->shipping_sub_option_id = $order->shipping_method_id;
 				$order->shipping_method_id = $parts[0];
 			}
 

diff --git a/controllers/shop_orders/_form_field_shipping_method.htm b/controllers/shop_orders/_form_field_shipping_method.htm
@@ -13,8 +13,8 @@
 		}
 
 		$selected_shipping_option = $form_model->shipping_method_id;
-		if ($form_model->shiping_sub_option_id)
-			$selected_shipping_option = $form_model->shiping_sub_option_id;
+		if ($form_model->shipping_sub_option_id)
+			$selected_shipping_option = $form_model->shipping_sub_option_id;
 	?>
 
 	<div id="shipping_option_selector">
@@ -37,7 +37,7 @@
 				<li class="header"><?= h($option->name) ?></li>
 				<? if (!$option->error_hint): ?>
 					<? foreach ($option->sub_options as $sub_option): ?>
-						<li class="selectable <?= ($option->id == $form_model->shipping_method_id && $sub_option->id == $form_model->shiping_sub_option_id) ? 'current' : null ?>" onclick="record_selector_click(this)">
+						<li class="selectable <?= ($option->id == $form_model->shipping_method_id && $sub_option->id == $form_model->shipping_sub_option_id) ? 'current' : null ?>" onclick="record_selector_click(this)">
 							<?= h($sub_option->name) ?>
 							<span class="right"><?= format_currency($sub_option->quote) ?></span>
 							<input type="hidden" value="<?= $sub_option->id ?>"/>

diff --git a/models/shop_order.php b/models/shop_order.php
@@ -106,7 +106,7 @@ class Shop_Order extends Db_ActiveRecord
 			'manual_shipping_quote'=>db_float
 		);
 
-		public $shiping_sub_option_id;
+		public $shipping_sub_option_id;
 		public $internal_shipping_suboption_id;
 
 		protected $api_added_columns = array();

diff --git a/updates/version.dat b/updates/version.dat
@@ -946,4 +946,5 @@
 #1.30.21 Allow exchange rates to be updated by CRON
 #1.30.22 Allow API Event shop:onApplyOrderEmailVars to overwrite existing email vars
 #1.30.23 Added new API event: shop:onUpdateShippingOptions
-#1.30.24 Added new API event: shop:onOptionMatrixRecordBeforeUpdate
+#1.30.24 Added new API event: shop:onOptionMatrixRecordBeforeUpdate
+#1.30.25 Typo shiping_sub_option_id, renamed to shipping_sub_option_id