mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2025-12-24 01:57:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix notifications

Browse Source
This commit is contained in:
jekkos-t520
2020-10-22 23:22:44 +02:00
committed by jekkos
parent e6ac4de69d
commit f04ff91f44
14 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -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

2
application/views/configs/email_config.php
View File

@@ -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();
},

2
application/views/configs/general_config.php
View File

@@ -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();
},

2
application/views/configs/integrations_config.php
View File

@@ -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'
});

2
application/views/configs/invoice_config.php
View File

@@ -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();

2
application/views/configs/receipt_config.php
View File

@@ -340,7 +340,7 @@ $(document).ready(function()
return ( dialog_confirmed || confirm('<?php echo $this->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'
});

2
application/views/messages/sms.php
View File

@@ -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'
});

2
application/views/sales/form.php
View File

@@ -151,7 +151,7 @@ $(document).ready(function()
$.get("<?php echo site_url($controller_name . '/send_pdf/' . $sale_info['sale_id']); ?>",
function(response) {
BootstrapDialog.closeAll();
$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
$.notify( { response.message }, { type: response.success ? 'success' : 'danger'} );
}, 'json'
);
}

2
application/views/sales/quote.php
View File

@@ -17,7 +17,7 @@ if (isset($error_message))
$.get('<?php echo site_url() . "/sales/send_pdf/" . $sale_id_num . "/quote"; ?>',
function(response)
{
$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
$.notify( { response.message }, { type: response.success ? 'success' : 'danger'} );
}, 'json'
);
};

2
application/views/sales/receipt.php
View File

@@ -17,7 +17,7 @@ if (isset($error_message))
$.get('<?php echo site_url() . "/sales/send_receipt/" . $sale_id_num; ?>',
function(response)
{
$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
$.notify( { response.message }, { type: response.success ? 'success' : 'danger'} );
}, 'json'
);
};

2
application/views/sales/register.php
View File

@@ -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)
{

2
application/views/sales/tax_invoice.php
View File

@@ -17,7 +17,7 @@ $(document).ready(function()
$.get('<?php echo site_url() . "/sales/send_pdf/" . $sale_id_num; ?>',
function(response)
{
$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
$.notify( { response.message }, { type: response.success ? 'success' : 'danger'} );
}, 'json'
);
};

2
application/views/sales/work_order.php
View File

@@ -17,7 +17,7 @@ if(isset($error_message))
$.get('<?php echo site_url() . "/sales/send_pdf/" . $sale_id_num . "/work_order"; ?>',
function(response)
{
$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
$.notify( { response.message }, { type: response.success ? 'success' : 'danger'} );
}, 'json'
);
};

8
composer.json
View File

@@ -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"
}
}