Merge branch 'master' of https://github.com/opencart/opencart

upload/admin/controller/setting/setting.php

@@ -266,6 +266,11 @@ public function index(): void {
 		$data['config_api_id'] = $this->config->get('config_api_id');
 
 		// Stock
+		$this->load->model('localisation/stock_status');
+
+		$data['stock_statuses'] = $this->model_localisation_stock_status->getStockStatuses();
+
+		$data['config_stock_status_id'] = $this->config->get('config_stock_status_id');
 		$data['config_stock_display'] = $this->config->get('config_stock_display');
 		$data['config_stock_warning'] = $this->config->get('config_stock_warning');
 		$data['config_stock_checkout'] = $this->config->get('config_stock_checkout');

upload/admin/language/en-gb/setting/setting.php

@@ -232,7 +232,7 @@
 $_['help_stock_display']                  = 'Display stock quantity on the product page.';
 $_['help_stock_warning']                  = 'Display out of stock message on the shopping cart page if a product is out of stock but stock checkout is yes. (Warning always shows if stock checkout is no)';
 $_['help_stock_checkout']                 = 'Allow customers to still checkout if the products they are ordering are not in stock.';
-$_['help_stock_status']                   = 'Set the default stock status when a product is awailable on stock.';
+$_['help_stock_status']                   = 'Set the default stock status when a product is available on stock.';
 $_['help_affiliate_status']               = 'If the affiliate system will not be used, you can disable it.';
 $_['help_affiliate_approval']             = 'Automatically approve any new affiliates who sign up.';
 $_['help_affiliate_auto']                 = 'Automatically add commission when each order reaches the complete status.';

upload/admin/language/en-gb/setting/store.php

@@ -65,6 +65,7 @@
 $_['entry_checkout']                   = 'Checkout Terms';
 $_['entry_stock_display']              = 'Display Stock';
 $_['entry_stock_checkout']             = 'Stock Checkout';
+$_['entry_stock_status']               = 'Stock Status';
 $_['entry_logo']                       = 'Store Logo';
 $_['entry_image_category']             = 'Category Image Size (W x H)';
 $_['entry_image_thumb']                = 'Product Image Thumb Size (W x H)';
@@ -102,6 +103,7 @@
 $_['help_checkout']                    = 'Forces people to agree to terms before an a customer can checkout.';
 $_['help_stock_display']               = 'Display stock quantity on the product page.';
 $_['help_stock_checkout']              = 'Allow customers to still checkout if the products they are ordering are not in stock.';
+$_['help_stock_status']                = 'Set the default stock status when a product is available on stock.';
 $_['help_product_count']               = 'Show the number of products inside the subcategories in the storefront header category menu. Be warned, this will cause an extreme performance hit for stores with a lot of subcategories!';
 
 // Error

upload/admin/view/template/common/authorize.twig

@@ -72,7 +72,7 @@ $('#button-send').on('click', function(e) {
     });
 });
 
-$(document).ready(function () {
+$(document).ready(function() {
     $('#button-send').trigger('click');
 });
 //--></script>

upload/catalog/language/en-gb/product/product.php

@@ -7,7 +7,6 @@
 $_['text_reward']                = 'Reward Points:';
 $_['text_points']                = 'Price in reward points:';
 $_['text_stock']                 = 'Availability:';
-$_['text_instock']               = 'In Stock';
 $_['text_tax']                   = 'Ex Tax:';
 $_['text_discount']              = ' or more ';
 $_['text_option']                = 'Available Options';