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 notification popup for fresh installs

Browse Source 
Fix docker setup by compiling php5-intl (#616)
This commit is contained in:
jekkos
2016-07-17 12:52:38 +02:00
parent a66868651b
commit 75db191baf
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -2,10 +2,12 @@ FROM php:5-apache
MAINTAINER jekkos
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
php5-gd \
php5-apcu
php5-apcu \
libicu-dev
RUN a2enmod rewrite
RUN docker-php-ext-install mysql mysqli bcmath
RUN docker-php-ext-install mysql mysqli bcmath intl
RUN echo "date.timezone = \"UTC\"" > /usr/local/etc/php/conf.d/timezone.ini
WORKDIR /app
COPY . /app

4
application/controllers/Config.php
View File

@@ -117,8 +117,8 @@ class Config extends Secure_Controller
'receiving_calculate_average_price' => $this->input->post('receiving_calculate_average_price') != NULL,
'lines_per_page' => $this->input->post('lines_per_page'),
'default_sales_discount' => $this->input->post('default_sales_discount'),
'config_notify_horizontal_position' => $this->input->post('config_notify_horizontal_position'),
'config_notify_vertical_position' => $this->input->post('config_notify_vertical_position'),
'notify_horizontal_position' => $this->input->post('notify_horizontal_position'),
'notify_vertical_position' => $this->input->post('notify_vertical_position'),
'custom1_name' => $this->input->post('custom1_name'),
'custom2_name' => $this->input->post('custom2_name'),
'custom3_name' => $this->input->post('custom3_name'),

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

@@ -96,23 +96,23 @@
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_notify_alignment'), 'config_notify_horizontal_position', array('class' => 'control-label col-xs-2')); ?>
<?php echo form_label($this->lang->line('config_notify_alignment'), 'notify_horizontal_position', array('class' => 'control-label col-xs-2')); ?>
<div class="col-sm-10">
<div class="form-group form-group-sm row">
<div class='col-sm-2'>
<?php echo form_dropdown('config_notify_vertical_position', array(
<?php echo form_dropdown('notify_vertical_position', array(
'top' => $this->lang->line('config_top'),
'bottom' => $this->lang->line('config_bottom')
),
$this->config->item('config_notify_vertical_position'), array('class' => 'form-control input-sm')); ?>
$this->config->item('notify_vertical_position'), array('class' => 'form-control input-sm')); ?>
</div>
<div class='col-sm-2'>
<?php echo form_dropdown('config_notify_horizontal_position', array(
<?php echo form_dropdown('notify_horizontal_position', array(
'left' => $this->lang->line('config_left'),
'center' => $this->lang->line('config_center'),
'right' => $this->lang->line('config_right')
),
$this->config->item('config_notify_horizontal_position'), array('class' => 'form-control input-sm')); ?>
$this->config->item('notify_horizontal_position'), array('class' => 'form-control input-sm')); ?>
</div>
</div>
</div>

4
application/views/partial/header_js.php
View File

@@ -12,8 +12,8 @@
}
$.notifyDefaults({ placement: {
align: '<?php echo $this->config->item('config_notify_horizontal_position'); ?>',
from: '<?php echo $this->config->item('config_notify_vertical_position'); ?>'
align: '<?php echo $this->config->item('notify_horizontal_position'); ?>',
from: '<?php echo $this->config->item('notify_vertical_position'); ?>'
}});
var post = $.post;