mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-13 16:32:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make bootstrap dialog buttons translatable (#439)

Browse Source 
Update deploy instructions in Readme (#616)
Add partial views to load CI translations in javascript (#439)
This commit is contained in:
jekkos
2016-06-25 01:48:43 +02:00
parent 6744ad1891
commit 57759d2775
32 changed files with 166 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@@ -41,9 +41,13 @@ If above information is not provided in full, your issue will be tagged as pendi
If missing information is not provided within a week we will close your issue.
Cloud install
--------------
-------------
A quick option would be to install directly to [Digitalocean](https://m.do.co/c/ac38c262507b) using their preconfigured LAMP stack.
Create a DO account first, add a droplet with preconfigured LAMP and follow the instructions for Local Install below. You will be running a provisioned VPS within minutes.
If you just want to run a quick demo of ospos or run it permanently in the cloud, then we
Cloud install using Docker
--------------------------
If you want to run a quick demo of ospos or run it permanently in the cloud, then we
suggest using Docker cloud together with the DigitalOcean hosting platform. This way all the
configuration is done automatically and the install will just work.
@@ -55,17 +59,14 @@ month of uptime on the platform. A full setup will only take about 2 minutes by
3. Login to docker cloud
4. Associate your docker cloud account with your previously created digital ocean account under settings
5. Create a new node on DigitalOcean through the `Infrastructure > Nodes` tab. Fill in a name (ospos) and choose a region near to you
6. Click this link [![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/) or Create a new stack under `Applications > Stacks` and paste the [contents of docker-cloud.yml](https://github.com/jekkos/opensourcepos/blob/master/docker-cloud.yml) from the source repository in the text field and click `Create and deploy`
7. Find your website url under `Infrastructure > Nodes > <yournode> > Endpoints > web`
8. Login with default username/password admin/pointofsale
9. DNS name for this server can be easily configured in the DigitalOcean control panel
Another option would be to install directly to [Digitalocean](https://m.do.co/c/ac38c262507b) without docker using their preconfigured LAMP stack.
Just create a DO account, add a droplet with preconfigured LAMP and follow the instructions below. You will be running a fully provisioned VPS within minutes.
6. Click [![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/)
7. Othewise create a new stack under `Applications > Stacks` and paste the [contents of docker-cloud.yml](https://github.com/jekkos/opensourcepos/blob/master/docker-cloud.yml) from the source repository in the text field and hit `Create and deploy`
8. Find your website url under `Infrastructure > Nodes > <yournode> > Endpoints > web`
9. Login with default username/password admin/pointofsale
10. DNS name for this server can be easily configured in the DigitalOcean control panel
Local install
-------------
1. Create/locate a new mysql database to install open source point of sale into
2. Execute the file database/database.sql to create the tables needed
3. unzip and upload Open Source Point of Sale files to web server

8
application/controllers/Reports.php
View File

@@ -805,7 +805,7 @@ class Reports extends Secure_Controller
'payment_type' => $report_data['payment_type'],
'comment' => $report_data['comment'],
'edit' => anchor("sales/edit/". $report_data['sale_id'], '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title' => $this->lang->line('sales_update'))
array('class'=>"modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update'))
)
));
@@ -841,7 +841,7 @@ class Reports extends Secure_Controller
'payment_type' => $row['payment_type'],
'comment' => $row['comment'],
'edit' => anchor("sales/edit/".$row['sale_id'], '<span class="glyphicon glyphicon-edit"></span>',
array('class' => "modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title' => $this->lang->line('sales_update'))
array('class' => "modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update'))
)
));
@@ -887,7 +887,7 @@ class Reports extends Secure_Controller
'reference' => $report_data['reference'],
'comment' => $report_data['comment'],
'edit' => anchor("receivings/edit/". $report_data['receiving_id'], '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title' => $this->lang->line('recvs_update'))
array('class'=>"modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('recvs_update'))
)
));
@@ -920,7 +920,7 @@ class Reports extends Secure_Controller
'reference' => $row['reference'],
'comment' => $row['comment'],
'edit' => anchor("receivings/edit/" . $row['receiving_id'], '<span class="glyphicon glyphicon-edit"></span>',
array('class' => "modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title' => $this->lang->line('recvs_update'))
array('class' => "modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('recvs_update'))
)
));

18
application/helpers/table_helper.php
View File

@@ -77,7 +77,7 @@ function get_sale_data_row($sale, $controller)
array('title'=>$CI->lang->line('sales_show_receipt'))
);
$row['edit'] = anchor($controller_name."/edit/$sale->sale_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title'=>$CI->lang->line($controller_name.'_update'))
array('class'=>"modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
);
return $row;
@@ -175,9 +175,9 @@ function get_person_data_row($person, $controller)
'email' => empty($person->email) ? '' : mailto($person->email,character_limiter($person->email,22)),
'phone_number' => character_limiter($person->phone_number,13),
'messages' => empty($person->phone_number) ? '' : anchor("Messages/view/$person->person_id", '<span class="glyphicon glyphicon-phone"></span>',
array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line('messages_sms_send'))),
array('class'=>"modal-dlg", 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line('messages_sms_send'))),
'edit' => anchor($controller_name."/view/$person->person_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line($controller_name.'_update'))
array('class'=>"modal-dlg", 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
));
}
@@ -217,9 +217,9 @@ function get_supplier_data_row($supplier, $controller)
'email' => empty($supplier->email) ? '' : mailto($supplier->email,character_limiter($supplier->email,22)),
'phone_number' => character_limiter($supplier->phone_number,13),
'messages' => empty($supplier->phone_number) ? '' : anchor("Messages/view/$supplier->person_id", '<span class="glyphicon glyphicon-phone"></span>',
array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line('messages_sms_send'))),
array('class'=>"modal-dlg", 'data-btn-submit' => $this->lang->line('common_submit'), 'title'=>$CI->lang->line('messages_sms_send'))),
'edit' => anchor($controller_name."/view/$supplier->person_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line($controller_name.'_update'))
array('class'=>"modal-dlg", 'data-btn-submit' => $this->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
));
}
@@ -280,13 +280,13 @@ function get_item_data_row($item, $controller)
'tax_percents' => !$tax_percents ? '-' : $tax_percents,
'item_pic' => $image,
'inventory' => anchor($controller_name."/inventory/$item->item_id", '<span class="glyphicon glyphicon-pushpin"></span>',
array('class' => "modal-dlg modal-btn-submit", 'title' => $CI->lang->line($controller_name.'_count'))
array('class' => "modal-dlg", 'data-btn-submit' => $CI->lang->line('common_submit'), 'title' => $CI->lang->line($controller_name.'_count'))
),
'stock' => anchor($controller_name."/count_details/$item->item_id", '<span class="glyphicon glyphicon-list-alt"></span>',
array('class' => "modal-dlg", 'title' => $CI->lang->line($controller_name.'_details_count'))
),
'edit' => anchor($controller_name."/view/$item->item_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class' => "modal-dlg modal-btn-submit", 'title' => $CI->lang->line($controller_name.'_update'))
array('class' => "modal-dlg", 'data-btn-submit' => $CI->lang->line('common_submit'), 'title' => $CI->lang->line($controller_name.'_update'))
));
}
@@ -317,7 +317,7 @@ function get_giftcard_data_row($giftcard, $controller)
'giftcard_number' => $giftcard->giftcard_number,
'value' => to_currency($giftcard->value),
'edit' => anchor($controller_name."/view/$giftcard->giftcard_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line($controller_name.'_update'))
array('class'=>"modal-dlg", 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
));
}
@@ -348,7 +348,7 @@ function get_item_kit_data_row($item_kit, $controller)
'cost_price' => to_currency($item_kit->total_cost_price),
'unit_price' => to_currency($item_kit->total_unit_price),
'edit' => anchor($controller_name."/view/$item_kit->item_kit_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line($controller_name.'_update'))
array('class'=>"modal-dlg", 'data-btn-submit' => $CI->lang->line('common_submit'), 'title'=>$CI->lang->line($controller_name.'_update'))
));
}

2
application/language/de-CH/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Kosten";
$lang["recvs_date"] = "Eingangsdatum";
$lang["recvs_date_required"] = "Ein korrektes Datum ist erforderlich";
$lang["recvs_date_type"] = "Datum ist erforderlich";
$lang["recvs_confirm_delete"] = "Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich";
$lang["receivings_confirm_delete"] = "Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich";
$lang["recvs_delete_entire_sale"] = "Wareneingang löschen";
$lang["recvs_discount"] = "Rabatt %";
$lang["recvs_edit"] = "Ändern";

2
application/language/en/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Cost";
$lang["recvs_date"] = "Receiving Date";
$lang["recvs_date_required"] = "A correct date needs to be filled in";
$lang["recvs_date_type"] = "Date field is required";
$lang["recvs_confirm_delete"] = "Are you sure you want to delete this receiving, this action cannot be undone";
$lang["receivings_confirm_delete"] = "Are you sure you want to delete this receiving, this action cannot be undone";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "Disc %";
$lang["recvs_edit"] = "Edit";

2
application/language/es/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Costo";
$lang["recvs_date"] = "Fecha de Recepción";
$lang["recvs_date_required"] = "Una fecha correcta debe ser ingresada";
$lang["recvs_date_type"] = "Campo Fecha es requerido";
$lang["recvs_confirm_delete"] = "¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer";
$lang["receivings_confirm_delete"] = "¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer";
$lang["recvs_delete_entire_sale"] = "Borrar venta completa";
$lang["recvs_discount"] = "Descuento %";
$lang["recvs_edit"] = "Editar";

2
application/language/fr/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Cout";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
$lang["recvs_confirm_delete"] = "";
$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "Remise %";
$lang["recvs_edit"] = "Éditer";

2
application/language/hr-HR/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Cijena";
$lang["recvs_date"] = "Datum";
$lang["recvs_date_required"] = "Potrebno je unijeti ispravan datum";
$lang["recvs_date_type"] = "Datum je potreban";
$lang["recvs_confirm_delete"] = "Želite li obrisati ovu primku? To ne ne može vratiti.";
$lang["receivings_confirm_delete"] = "Želite li obrisati ovu primku? To ne ne može vratiti.";
$lang["recvs_delete_entire_sale"] = "Obrisati cijelu prodaju";
$lang["recvs_discount"] = "Rabat %";
$lang["recvs_edit"] = "Urediti";

2
application/language/hu-HU/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Költség";
$lang["recvs_date"] = "Beérkezés dátuma";
$lang["recvs_date_required"] = "Korrekt dátumot kell megadni";
$lang["recvs_date_type"] = "Dátum mező kötelező";
$lang["recvs_confirm_delete"] = "Biztos, hogy törli az átvételt? Nem lehet visszavonni!";
$lang["receivings_confirm_delete"] = "Biztos, hogy törli az átvételt? Nem lehet visszavonni!";
$lang["recvs_delete_entire_sale"] = "Teljes értékesités törlése";
$lang["recvs_discount"] = "Kedv. %";
$lang["recvs_edit"] = "Szerkeszt";

2
application/language/id/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Harga";
$lang["recvs_date"] = "Tanggal";
$lang["recvs_date_required"] = "Tanngalnya harus diisi";
$lang["recvs_date_type"] = "Model Tanggal";
$lang["recvs_confirm_delete"] = "Konfirmasi Hapus";
$lang["receivings_confirm_delete"] = "Konfirmasi Hapus";
$lang["recvs_delete_entire_sale"] = "Hapus Semua Penjualan";
$lang["recvs_discount"] = "Diskon %";
$lang["recvs_edit"] = "Ubah";

2
application/language/nl-BE/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Kost";
$lang["recvs_date"] = "Order Datum";
$lang["recvs_date_required"] = "Er moet een correcte datum ingevuld worden";
$lang["recvs_date_type"] = "Datum is vereist";
$lang["recvs_confirm_delete"] = "Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.";
$lang["receivings_confirm_delete"] = "Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.";
$lang["recvs_delete_entire_sale"] = "Verwijder";
$lang["recvs_discount"] = "Korting %";
$lang["recvs_edit"] = "Bewerk";

2
application/language/pt-BR/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Custo";
$lang["recvs_date"] = "Data Recebimento";
$lang["recvs_date_required"] = "A data correta precisa ser preenchida";
$lang["recvs_date_type"] = "Campo de data é obrigatório";
$lang["recvs_confirm_delete"] = "Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita";
$lang["receivings_confirm_delete"] = "Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita";
$lang["recvs_delete_entire_sale"] = "Apagar toda a venda";
$lang["recvs_discount"] = "Desc. %";
$lang["recvs_edit"] = "Editar";

2
application/language/ru/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "стоимость";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
$lang["recvs_confirm_delete"] = "";
$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "Скидка %";
$lang["recvs_edit"] = "редактировать";

2
application/language/th/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
$lang["recvs_confirm_delete"] = "";
$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "";
$lang["recvs_discount"] = "ส่วนลด %";
$lang["recvs_edit"] = "แก้ไข";

2
application/language/tr/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Ücret";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
$lang["recvs_confirm_delete"] = "";
$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "İndirim %";
$lang["recvs_edit"] = "Düzenle";

2
application/language/zh/receivings_lang.php
View File

@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "成本";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
$lang["recvs_confirm_delete"] = "";
$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "折古 %";
$lang["recvs_edit"] = "編輯";

2
application/views/giftcards/manage.php
View File

@@ -13,7 +13,7 @@ $(document).ready(function()
</script>
<div id="title_bar" class="btn-toolbar">
<button class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url($controller_name."/view"); ?>'
<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $CI->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
title='<?php echo $this->lang->line($controller_name.'_new'); ?>'>
<span class="glyphicon glyphicon-heart">&nbsp</span><?php echo $this->lang->line($controller_name . '_new'); ?>
</button>

2
application/views/item_kits/manage.php
View File

@@ -24,7 +24,7 @@ $(document).ready(function()
</script>
<div id="title_bar" class="btn-toolbar">
<button class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url($controller_name."/view"); ?>'
<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
title='<?php echo $this->lang->line($controller_name. '_new'); ?>'>
<span class="glyphicon glyphicon-tags">&nbsp</span><?php echo $this->lang->line($controller_name. '_new'); ?>
</button>

4
application/views/items/manage.php
View File

@@ -58,12 +58,12 @@ $(document).ready(function()
</script>
<div id="title_bar" class="btn-toolbar print_hide">
<button class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url($controller_name."/excel_import"); ?>'
<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/excel_import"); ?>'
title='<?php echo $this->lang->line('customers_import_items_excel'); ?>'>
<span class="glyphicon glyphicon-import">&nbsp</span><?php echo $this->lang->line('common_import_excel'); ?>
</button>
<button class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url($controller_name."/view"); ?>'
<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
title='<?php echo $this->lang->line($controller_name . '_new'); ?>'>
<span class="glyphicon glyphicon-tag">&nbsp</span><?php echo $this->lang->line($controller_name. '_new'); ?>
</button>

2
application/views/login.php
View File

@@ -6,7 +6,7 @@
<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<!-- end css template tags -->

11
application/views/partial/header.php
View File

@@ -67,19 +67,20 @@
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=6565b523f9"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=f8daa2f957"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=d18a7b4a1b" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=26c6d98f54" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
<?php $this->load->view('partial/lang_lines'); ?>
<script type="text/javascript">
// live clock
function clockTick() {
var clockTick = function clockTick() {
setInterval('updateClock();', 1000);
}

17
application/views/partial/lang_lines.php Normal file
View File

@@ -0,0 +1,17 @@
<script type="text/javascript">
(function(lang, $) {
var lines = {
'common_submit' : "<?php echo $this->lang->line('common_submit') ?>",
'common_close' : "<?php echo $this->lang->line('common_close') ?>"
};
return {
line: function(key) {
return lines[key];
}
};
})(window.lang = window.lang || {}, jQuery);
</script>

4
application/views/people/manage.php
View File

@@ -35,14 +35,14 @@ $(document).ready(function()
if ($controller_name == 'customers')
{
?>
<button class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url($controller_name."/excel_import"); ?>'
<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/excel_import"); ?>'
title='<?php echo $this->lang->line('customers_import_items_excel'); ?>'>
<span class="glyphicon glyphicon-import">&nbsp</span><?php echo $this->lang->line('common_import_excel'); ?>
</button>
<?php
}
?>
<button class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url($controller_name."/view"); ?>'
<button class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url($controller_name."/view"); ?>'
title='<?php echo $this->lang->line($controller_name. '_new'); ?>'>
<span class="glyphicon glyphicon-user">&nbsp</span><?php echo $this->lang->line($controller_name. '_new'); ?>
</button>

4
application/views/receivings/receiving.php
View File

@@ -85,7 +85,7 @@ if (isset($success))
<?php echo form_input(array('name'=>'item', 'id'=>'item', 'class'=>'form-control input-sm', 'size'=>'50', 'tabindex'=>'1')); ?>
</li>
<li class="pull-right">
<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url("items/view"); ?>'
<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("items/view"); ?>'
title='<?php echo $this->lang->line('sales_new_item'); ?>'>
<span class="glyphicon glyphicon-tag">&nbsp</span><?php echo $this->lang->line('sales_new_item'); ?>
</button>
@@ -288,7 +288,7 @@ if (isset($success))
<label id="supplier_label" for="supplier" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo $this->lang->line('recvs_select_supplier'); ?></label>
<?php echo form_input(array('name'=>'supplier', 'id'=>'supplier', 'class'=>'form-control input-sm', 'value'=>$this->lang->line('recvs_start_typing_supplier_name'))); ?>
<button id='new_supplier_button' class='btn btn-info btn-sm modal-dlg modal-btn-submit' data-href='<?php echo site_url("suppliers/view"); ?>'
<button id='new_supplier_button' class='btn btn-info btn-sm modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("suppliers/view"); ?>'
title='<?php echo $this->lang->line('recvs_new_supplier'); ?>'>
<span class="glyphicon glyphicon-user">&nbsp</span><?php echo $this->lang->line('recvs_new_supplier'); ?>
</button>

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

@@ -78,7 +78,7 @@ if (isset($success))
<span class="ui-helper-hidden-accessible" role="status"></span>
</li>
<li class="pull-right">
<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg modal-btn-submit' data-href='<?php echo site_url("items/view"); ?>'
<button id='new_item_button' class='btn btn-info btn-sm pull-right modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("items/view"); ?>'
title='<?php echo $this->lang->line($controller_name . '_new_item'); ?>'>
<span class="glyphicon glyphicon-tag">&nbsp</span><?php echo $this->lang->line($controller_name. '_new_item'); ?>
</button>
@@ -298,7 +298,7 @@ if (isset($success))
<label id="customer_label" for="customer" class="control-label" style="margin-bottom: 1em; margin-top: -1em;"><?php echo $this->lang->line('sales_select_customer'); ?></label>
<?php echo form_input(array('name'=>'customer', 'id'=>'customer', 'class'=>'form-control input-sm', 'value'=>$this->lang->line('sales_start_typing_customer_name')));?>
<button class='btn btn-info btn-sm modal-dlg modal-btn-submit' data-href='<?php echo site_url("customers/view"); ?>'
<button class='btn btn-info btn-sm modal-dlg' data-btn-submit='<?php echo $this->lang->line('common_submit') ?>' data-href='<?php echo site_url("customers/view"); ?>'
title='<?php echo $this->lang->line($controller_name. '_new_customer'); ?>'>
<span class="glyphicon glyphicon-user">&nbsp</span><?php echo $this->lang->line($controller_name. '_new_customer'); ?>
</button>

4
dist/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

75
dist/opensourcepos.js vendored
View File

@@ -42713,6 +42713,7 @@ $.extend($.fn, {
this.validateDelegate( ":submit", "click", function( event ) {
if ( validator.settings.submitHandler ) {
validator.submitButton = event.target;
}
// allow suppressing validation by adding a cancel class to the submit button
@@ -44034,6 +44035,66 @@ $.extend($.fn, {
});
}));
jQuery.base64 = (function($) {
// private property
var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
// private method for UTF-8 encoding
function utf8Encode(string) {
string = string.replace(/\r\n/g,"\n");
var utftext = "";
for (var n = 0; n < string.length; n++) {
var c = string.charCodeAt(n);
if (c < 128) {
utftext += String.fromCharCode(c);
}
else if((c > 127) && (c < 2048)) {
utftext += String.fromCharCode((c >> 6) | 192);
utftext += String.fromCharCode((c & 63) | 128);
}
else {
utftext += String.fromCharCode((c >> 12) | 224);
utftext += String.fromCharCode(((c >> 6) & 63) | 128);
utftext += String.fromCharCode((c & 63) | 128);
}
}
return utftext;
}
function encode(input) {
var output = "";
var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
var i = 0;
input = utf8Encode(input);
while (i < input.length) {
chr1 = input.charCodeAt(i++);
chr2 = input.charCodeAt(i++);
chr3 = input.charCodeAt(i++);
enc1 = chr1 >> 2;
enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
enc4 = chr3 & 63;
if (isNaN(chr2)) {
enc3 = enc4 = 64;
} else if (isNaN(chr3)) {
enc4 = 64;
}
output = output +
keyStr.charAt(enc1) + keyStr.charAt(enc2) +
keyStr.charAt(enc3) + keyStr.charAt(enc4);
}
return output;
}
return {
encode: function (str) {
return encode(str);
}
};
}(jQuery));
/*
* Project: Bootstrap Notify = v3.1.3
* Description: Turns standard Bootstrap alerts into "Growl-like" notifications.
@@ -44242,7 +44303,7 @@ $.extend($.fn, {
hasAnimation = false,
settings = this.settings;
$('[data-notify-position="' + this.settings.placement.from + '-' + this.settings.placement.align + '"]:not([data-closing="true"])').each(function() {
$('[data-notify-position="' + this.settings.placement.from + '-' + this.settings.placement.align + '"]:not([data-closing="true"])').each(function() {
return offsetAmt = Math.max(offsetAmt, parseInt($(this).css(settings.placement.from)) + parseInt($(this).outerHeight()) + parseInt(settings.spacing));
});
if (this.settings.newest_on_top == true) {
@@ -44352,6 +44413,7 @@ $.extend($.fn, {
}
}
}, 600);
},
reposition: function(posX) {
var self = this,
@@ -47875,13 +47937,16 @@ typeof h.headerrows&&(h.headerrows.length=0);"undefined"!=typeof h.columns&&(h.c
if (width_class && width_class.length > 1) {
dialog_class = className;
}
var btn_class = className.split("modal-btn-");
});
$.each($(this).data(), function(name, value) {
var btn_class = name.split("btn");
if (btn_class && btn_class.length > 1) {
var btn_name = btn_class[1];
var btn_name = btn_class[1].toLowerCase();
var is_submit = btn_name == 'submit';
buttons.push({
id: btn_name,
label: btn_name.charAt(0).toUpperCase() + btn_name.slice(1),
label: value,
cssClass: button_class[btn_name],
hotkey: is_submit ? 13 : undefined, // Enter.
action: submit(btn_name)
@@ -47891,7 +47956,7 @@ typeof h.headerrows&&(h.headerrows.length=0);"undefined"!=typeof h.columns&&(h.c
!buttons.length && buttons.push({
id: 'close',
label: 'Close',
label: lang.line('common_close'),
cssClass: 'btn-primary',
action: function(dialog_ref) {
dialog_ref.close();

20
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
js/manage_tables.js
View File

@@ -35,13 +35,16 @@
if (width_class && width_class.length > 1) {
dialog_class = className;
}
var btn_class = className.split("modal-btn-");
});
$.each($(this).data(), function(name, value) {
var btn_class = name.split("btn");
if (btn_class && btn_class.length > 1) {
var btn_name = btn_class[1];
var btn_name = btn_class[1].toLowerCase();
var is_submit = btn_name == 'submit';
buttons.push({
id: btn_name,
label: btn_name.charAt(0).toUpperCase() + btn_name.slice(1),
label: value,
cssClass: button_class[btn_name],
hotkey: is_submit ? 13 : undefined, // Enter.
action: submit(btn_name)
@@ -51,7 +54,7 @@
!buttons.length && buttons.push({
id: 'close',
label: 'Close',
label: lang.line('common_close'),
cssClass: 'btn-primary',
action: function(dialog_ref) {
dialog_ref.close();

2
templates/spacelab/views/login.php
View File

@@ -6,7 +6,7 @@
<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- end css template tags -->

6
templates/spacelab/views/partial/header.php
View File

@@ -66,14 +66,14 @@
<!--[if lte IE 8]>
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=6565b523f9"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=f8daa2f957"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=d18a7b4a1b" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=26c6d98f54" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

2
translations/receivings_lang.csv
View File

@@ -10,7 +10,7 @@ recvs_cost,Költség,Kosten,Kost,Costo,Cost,Cout,成本,стоимость,,Ücr
recvs_date,Beérkezés dátuma,Eingangsdatum,Order Datum,Fecha de Recepción,Receiving Date,,,,,,Tanggal,Data Recebimento,Datum
recvs_date_required,Korrekt dátumot kell megadni,Ein korrektes Datum ist erforderlich,Er moet een correcte datum ingevuld worden,Una fecha correcta debe ser ingresada,A correct date needs to be filled in,,,,,,Tanngalnya harus diisi,A data correta precisa ser preenchida,Potrebno je unijeti ispravan datum
recvs_date_type,Dátum mező kötelező,Datum ist erforderlich,Datum is vereist,Campo Fecha es requerido,Date field is required,,,,,,Model Tanggal,Campo de data é obrigatório,Datum je potreban
recvs_confirm_delete,"Biztos, hogy törli az átvételt? Nem lehet visszavonni!",Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich,Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.,¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer,"Are you sure you want to delete this receiving, this action cannot be undone",,,,,,Konfirmasi Hapus,Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita,Želite li obrisati ovu primku? To ne ne može vratiti.
receivings_confirm_delete,"Biztos, hogy törli az átvételt? Nem lehet visszavonni!",Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich,Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.,¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer,"Are you sure you want to delete this receiving, this action cannot be undone",,,,,,Konfirmasi Hapus,Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita,Želite li obrisati ovu primku? To ne ne može vratiti.
recvs_delete_entire_sale,Teljes értékesités törlése,Wareneingang löschen,Verwijder,Borrar venta completa,Delete entire sale,Delete entire sale,Delete entire sale,Delete entire sale,,Delete entire sale,Hapus Semua Penjualan,Apagar toda a venda,Obrisati cijelu prodaju
recvs_discount,Kedv. %,Rabatt %,Korting %,Descuento %,Disc %,Remise %,折古 %,Скидка %,ส่วนลด %,İndirim %,Diskon %,Desc. %,Rabat %
recvs_edit,Szerkeszt,Ändern,Bewerk,Editar,Edit,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah,Editar,Urediti
1 label hu-HU de-CH nl-BE es en fr zh ru th tr id pt-BR hr-HR
10 recvs_date Beérkezés dátuma Eingangsdatum Order Datum Fecha de Recepción Receiving Date Tanggal Data Recebimento Datum
11 recvs_date_required Korrekt dátumot kell megadni Ein korrektes Datum ist erforderlich Er moet een correcte datum ingevuld worden Una fecha correcta debe ser ingresada A correct date needs to be filled in Tanngalnya harus diisi A data correta precisa ser preenchida Potrebno je unijeti ispravan datum
12 recvs_date_type Dátum mező kötelező Datum ist erforderlich Datum is vereist Campo Fecha es requerido Date field is required Model Tanggal Campo de data é obrigatório Datum je potreban
13 recvs_confirm_delete receivings_confirm_delete Biztos, hogy törli az átvételt? Nem lehet visszavonni! Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden. ¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer Are you sure you want to delete this receiving, this action cannot be undone Konfirmasi Hapus Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita Želite li obrisati ovu primku? To ne ne može vratiti.
14 recvs_delete_entire_sale Teljes értékesités törlése Wareneingang löschen Verwijder Borrar venta completa Delete entire sale Delete entire sale Delete entire sale Delete entire sale Delete entire sale Hapus Semua Penjualan Apagar toda a venda Obrisati cijelu prodaju
15 recvs_discount Kedv. % Rabatt % Korting % Descuento % Disc % Remise % 折古 % Скидка % ส่วนลด % İndirim % Diskon % Desc. % Rabat %
16 recvs_edit Szerkeszt Ändern Bewerk Editar Edit Éditer 編輯 редактировать แก้ไข Düzenle Ubah Editar Urediti