diff --git a/Dockerfile b/Dockerfile index b5a2145f7..886270677 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libgd-dev \ openssl + RUN a2enmod rewrite RUN docker-php-ext-install mysqli bcmath intl gd RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini @@ -20,7 +21,7 @@ FROM ospos AS ospos_test COPY --from=composer /usr/bin/composer /usr/bin/composer -RUN apt-get install -y libzip-dev wget +RUN apt-get install -y libzip-dev wget git RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -O /bin/wait-for-it.sh && chmod +x /bin/wait-for-it.sh RUN docker-php-ext-install zip RUN composer install -d/app diff --git a/application/views/configs/email_config.php b/application/views/configs/email_config.php index a066e2466..11d8a3a8f 100644 --- a/application/views/configs/email_config.php +++ b/application/views/configs/email_config.php @@ -142,7 +142,7 @@ $(document).ready(function() return true; }, success: function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); // set back disabled state check_protocol(); }, diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php index d1f04bf59..1cc47b44d 100644 --- a/application/views/configs/general_config.php +++ b/application/views/configs/general_config.php @@ -458,7 +458,7 @@ $(document).ready(function() return true; }, success: function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); // set back disabled state enable_disable_gcaptcha_enable(); }, diff --git a/application/views/configs/integrations_config.php b/application/views/configs/integrations_config.php index d2b85259d..494fab68a 100644 --- a/application/views/configs/integrations_config.php +++ b/application/views/configs/integrations_config.php @@ -70,7 +70,7 @@ $(document).ready(function() submitHandler: function(form) { $(form).ajaxSubmit({ success: function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); }, dataType: 'json' }); diff --git a/application/views/configs/invoice_config.php b/application/views/configs/invoice_config.php index 3e95273a0..8ac8dbbe2 100644 --- a/application/views/configs/invoice_config.php +++ b/application/views/configs/invoice_config.php @@ -209,7 +209,7 @@ $(document).ready(function() return true; }, success: function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); // set back disabled state enable_disable_invoice_enable(); enable_disable_work_order_enable(); diff --git a/application/views/configs/receipt_config.php b/application/views/configs/receipt_config.php index f57e4bc3c..19a56b859 100644 --- a/application/views/configs/receipt_config.php +++ b/application/views/configs/receipt_config.php @@ -340,7 +340,7 @@ $(document).ready(function() return ( dialog_confirmed || confirm('lang->line('config_jsprintsetup_required'); ?>') ); }, success: function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); }, dataType:'json' }); diff --git a/application/views/messages/sms.php b/application/views/messages/sms.php index 44e30b300..f5c967253 100755 --- a/application/views/messages/sms.php +++ b/application/views/messages/sms.php @@ -42,7 +42,7 @@ $(document).ready(function() submitHandler: function(form) { $(form).ajaxSubmit({ success: function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); }, dataType: 'json' }); diff --git a/application/views/sales/form.php b/application/views/sales/form.php index f7eeb52bf..1018f6754 100755 --- a/application/views/sales/form.php +++ b/application/views/sales/form.php @@ -151,7 +151,7 @@ $(document).ready(function() $.get("", function(response) { BootstrapDialog.closeAll(); - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); }, 'json' ); } diff --git a/application/views/sales/quote.php b/application/views/sales/quote.php index 5f202afb0..a8c2fe73a 100644 --- a/application/views/sales/quote.php +++ b/application/views/sales/quote.php @@ -17,7 +17,7 @@ if (isset($error_message)) $.get('', function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); }, 'json' ); }; diff --git a/application/views/sales/receipt.php b/application/views/sales/receipt.php index 961441f3c..776653f79 100644 --- a/application/views/sales/receipt.php +++ b/application/views/sales/receipt.php @@ -17,7 +17,7 @@ if (isset($error_message)) $.get('', function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); }, 'json' ); }; diff --git a/application/views/sales/register.php b/application/views/sales/register.php index 33cb279b9..88fddd4bd 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -870,7 +870,7 @@ $(document).ready(function() table_support.handle_submit = function(resource, response, stay_open) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); if(response.success) { diff --git a/application/views/sales/tax_invoice.php b/application/views/sales/tax_invoice.php index 9dc9da0b3..b718215fb 100644 --- a/application/views/sales/tax_invoice.php +++ b/application/views/sales/tax_invoice.php @@ -17,7 +17,7 @@ $(document).ready(function() $.get('', function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); }, 'json' ); }; diff --git a/application/views/sales/work_order.php b/application/views/sales/work_order.php index 16192c1d3..1ef71e866 100644 --- a/application/views/sales/work_order.php +++ b/application/views/sales/work_order.php @@ -17,7 +17,7 @@ if(isset($error_message)) $.get('', function(response) { - $.notify(response.message, { type: response.success ? 'success' : 'danger'} ); + $.notify( { response.message }, { type: response.success ? 'success' : 'danger'} ); }, 'json' ); }; diff --git a/composer.json b/composer.json index 569e8b537..a4d430979 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,6 @@ "POS" ], "homepage": "https://github.com/opensourcepos/opensourcepos", - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/kenjis/ci-phpunit-test" - } - ], "require": { "php": "^5.6 || ^7.0", "codeigniter/framework": "^3.1.11", @@ -33,6 +27,6 @@ "require-dev": { "mikey179/vfsstream": "1.1.*", "phpunit/phpunit": "7.5.6", - "kenjis/ci-phpunit-test": "dev-master" + "kenjis/ci-phpunit-test": "0.18.0" } }