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

opencart · Apr 23, 2024 · 909bc59 · 909bc59
2 parents 0fa0754 + d80f2ff
commit 909bc59
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/upload/admin/language/en-gb/setting/setting.php b/upload/admin/language/en-gb/setting/setting.php
@@ -128,6 +128,7 @@
 $_['entry_stock_display']                 = 'Display Stock';
 $_['entry_stock_warning']                 = 'Show Out Of Stock Warning';
 $_['entry_stock_checkout']                = 'Stock Checkout';
+$_['entry_stock_status']                  = 'Stock Status';
 $_['entry_affiliate_status']              = 'Affiliate Status';
 $_['entry_affiliate_group']               = 'Affiliate Group';
 $_['entry_affiliate_approval']            = 'Affiliate Requires Approval';
@@ -231,6 +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_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.';

diff --git a/upload/admin/view/template/setting/setting.twig b/upload/admin/view/template/setting/setting.twig
@@ -898,6 +898,17 @@
                           <div class="form-text">{{ help_stock_checkout }}</div>
                         </div>
                       </div>
+                      <div class="row mb-3">
+                        <label for="input-stock-status" class="col-sm-2 col-form-label">{{ entry_stock_status }}</label>
+                        <div class="col-sm-10">
+                          <select name="config_stock_status_id" id="input-stock-status" class="form-select">
+                            {% for stock_status in stock_statuses %}
+                              <option value="{{ stock_status.stock_status_id }}"{% if stock_status.stock_status_id == config_stock_status_id %} selected{% endif %}>{{ stock_status.name }}</option>
+                            {% endfor %}
+                          </select>
+                          <div class="form-text">{{ help_stock_status }}</div>
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </div>

diff --git a/upload/catalog/language/en-gb/account/wishlist.php b/upload/catalog/language/en-gb/account/wishlist.php
@@ -4,7 +4,6 @@
 
 // Text
 $_['text_account']    = 'Account';
-$_['text_instock']    = 'In Stock';
 $_['text_wishlist']   = 'Wish List (%s)';
 $_['text_login']      = 'You must <a href="%s">login</a> or <a href="%s">create an account</a> to save <a href="%s">%s</a> to your <a href="%s">wish list</a>!';
 $_['text_success']    = 'Success: You have added <a href="%s">%s</a> to your <a href="%s">wish list</a>!';

diff --git a/upload/catalog/language/en-gb/product/compare.php b/upload/catalog/language/en-gb/product/compare.php
@@ -10,7 +10,6 @@
 $_['text_model']        = 'Model';
 $_['text_manufacturer'] = 'Brand';
 $_['text_availability'] = 'Availability';
-$_['text_instock']      = 'In Stock';
 $_['text_rating']       = 'Rating';
 $_['text_reviews']      = 'Based on %s reviews.';
 $_['text_summary']      = 'Summary';