diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php
index 304f521c1..129deabd7 100644
--- a/application/views/configs/general_config.php
+++ b/application/views/configs/general_config.php
@@ -25,16 +25,15 @@
'value' => $this->config->item('default_sales_discount'))); ?>
'default_sales_discount_type',
- 'name'=>'default_sales_discount_type',
- 'value'=>1,
- 'data-toggle'=>"toggle",
- 'data-size'=>'small',
- 'data-onstyle'=>'success',
- 'data-on'=>''.$this->config->item('currency_symbol').'',
- 'data-off'=>'%',
- 'checked'=>$this->config->item('default_sales_discount_type'))
- ); ?>
+ 'id' => 'default_sales_discount_type',
+ 'name' => 'default_sales_discount_type',
+ 'value' => 1,
+ 'data-toggle' => 'toggle',
+ 'data-size' => 'normal',
+ 'data-onstyle' => 'success',
+ 'data-on' => ''.$this->config->item('currency_symbol').'',
+ 'data-off' => '%',
+ 'checked' => $this->config->item('default_sales_discount_type'))); ?>
@@ -86,17 +85,17 @@
@@ -390,7 +389,6 @@ $(document).ready(function()
window.location='';
});
-
$('#general_config_form').validate($.extend(form_support.handler, {
errorLabelContainer: "#general_error_message_box",
@@ -450,7 +448,7 @@ $(document).ready(function()
// set back disabled state
enable_disable_gcaptcha_enable();
},
- dataType:'json'
+ dataType: 'json'
});
}
}));
diff --git a/composer.lock b/composer.lock
index c187907ef..4c6900a23 100644
--- a/composer.lock
+++ b/composer.lock
@@ -103,16 +103,16 @@
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.15",
+ "version": "v2.0.17",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09"
+ "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09",
- "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
+ "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
"shasum": ""
},
"require": {
@@ -148,7 +148,7 @@
"pseudorandom",
"random"
],
- "time": "2018-06-08 15:26:40"
+ "time": "2018-07-04 16:31:37"
},
{
"name": "phenx/php-font-lib",
@@ -309,28 +309,28 @@
},
{
"name": "vlucas/phpdotenv",
- "version": "v2.4.0",
+ "version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+ "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
- "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+ "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
- "phpunit/phpunit": "^4.8 || ^5.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
},
"autoload": {
@@ -340,7 +340,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause-Attribution"
+ "BSD-3-Clause"
],
"authors": [
{
@@ -355,7 +355,7 @@
"env",
"environment"
],
- "time": "2016-09-01 10:05:43"
+ "time": "2018-07-29 20:33:41"
}
],
"aliases": [],