mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-26 10:03:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bump vs to 3.1.1, fix Giftcard bug, fix en_GB translations (#1546)

Browse Source
This commit is contained in:
FrancescoUK
2017-09-03 18:22:28 +01:00
parent 52ab4ce035
commit 9e7b0db950
14 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/config/config.php
View File

@@ -8,7 +8,7 @@
|
|
*/
$config['application_version'] = '3.1.0';
$config['application_version'] = '3.1.1';
/*
|--------------------------------------------------------------------------

24
application/language/en-GB/customers_lang.php
View File

@@ -2,22 +2,22 @@
$lang["customers_account_number"] = "Account #";
$lang["customers_account_number_duplicate"] = "This account number is already present in the database";
$lang["customers_available_points"] = "Available Points";
$lang["customers_available_points"] = "Available points";
$lang["customers_average"] = "Average spent";
$lang["customers_avg_discount"] = "Average discount";
$lang["customers_basic_information"] = "Information";
$lang["customers_cannot_be_deleted"] = "Could not delete the selected customers, one or more of the selected customers has sales.";
$lang["customers_cannot_be_deleted"] = "Could not delete the selected Customer(s), one or more of the selected Customer(s) has sales.";
$lang["customers_company_name"] = "Company";
$lang["customers_confirm_delete"] = "Are you sure you want to delete the selected customer(s)?";
$lang["customers_confirm_delete"] = "Are you sure you want to delete the selected Customer(s)?";
$lang["customers_customer"] = "Customer";
$lang["customers_discount"] = "Discount";
$lang["customers_email_duplicate"] = "The email address is already present in the database";
$lang["customers_error_adding_updating"] = "Error adding/updating customer";
$lang["customers_error_adding_updating"] = "Error adding/updating Customer";
$lang["customers_excel_import_failed"] = "The excel import failed";
$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or has some wrong format";
$lang["customers_excel_import_partially_failed"] = "Most customers imported. But some were not, here is the list";
$lang["customers_excel_import_success"] = "Import of customers successful";
$lang["customers_import_items_excel"] = "Import customers from Excel sheet";
$lang["customers_excel_import_partially_failed"] = "Most Customers imported. But some were not, here is the list";
$lang["customers_excel_import_success"] = "Import of Customers successful";
$lang["customers_import_items_excel"] = "Import Customers from Excel sheet";
$lang["customers_mailchimp_activity_click"] = "Email click";
$lang["customers_mailchimp_activity_lastopen"] = "Last open email";
$lang["customers_mailchimp_activity_open"] = "Email open";
@@ -31,13 +31,13 @@ $lang["customers_mailchimp_vip"] = "VIP";
$lang["customers_max"] = "Max spent";
$lang["customers_min"] = "Min spent";
$lang["customers_new"] = "New Customer";
$lang["customers_none_selected"] = "You have not selected any customer(s) to delete";
$lang["customers_one_or_multiple"] = "customer(s)";
$lang["customers_none_selected"] = "You have not selected any Customer(s) to delete";
$lang["customers_one_or_multiple"] = "Customer(s)";
$lang["customers_quantity"] = "Quantity";
$lang["customers_stats_info"] = "Stats";
$lang["customers_successful_adding"] = "You have successfully added a customer";
$lang["customers_successful_deleted"] = "You have successfully deleted a Giftcard";
$lang["customers_successful_updating"] = "You have successfully updated customer";
$lang["customers_successful_adding"] = "You have successfully added Customer";
$lang["customers_successful_deleted"] = "You have successfully deleted Customer";
$lang["customers_successful_updating"] = "You have successfully updated Customer";
$lang["customers_tax_code"] = "Tax Code";
$lang["customers_taxable"] = "Taxable";
$lang["customers_total"] = "Total spent";

18
application/language/en-GB/employees_lang.php
View File

@@ -1,19 +1,19 @@
<?php
$lang["employees_basic_information"] = "Information";
$lang["employees_cannot_be_deleted"] = "Could not delete the selected employees, one or more of the employees has processed sales or you are trying to delete yourself";
$lang["employees_cannot_be_deleted"] = "Could not delete the selected Employee(s), one or more of the Employee(s) has processed sales or you are trying to delete yourself";
$lang["employees_change_password"] = "Change Password";
$lang["employees_confirm_delete"] = "Are you sure you want to delete the selected employees?";
$lang["employees_confirm_delete"] = "Are you sure you want to delete the selected Employee(s)?";
$lang["employees_current_password"] = "Current Password";
$lang["employees_current_password_invalid"] = "Invalid Current Password";
$lang["employees_employee"] = "Employee";
$lang["employees_error_adding_updating"] = "Error adding/updating employee";
$lang["employees_error_adding_updating"] = "Error adding/updating Employee";
$lang["employees_error_deleting_demo_admin"] = "You cannot delete the demo admin user";
$lang["employees_error_updating_demo_admin"] = "You cannot change the demo admin user";
$lang["employees_login_info"] = "Login";
$lang["employees_new"] = "New Employee";
$lang["employees_none_selected"] = "You have not selected any employees to delete";
$lang["employees_one_or_multiple"] = "employee(s)";
$lang["employees_none_selected"] = "You have not selected any Employee(s) to delete";
$lang["employees_one_or_multiple"] = "Employee(s)";
$lang["employees_password"] = "Password";
$lang["employees_password_minlength"] = "Passwords must be at least 8 characters";
$lang["employees_password_must_match"] = "Passwords do not match";
@@ -23,12 +23,12 @@ $lang["employees_permission_desc"] = "Check the boxes below to grant access to m
$lang["employees_permission_info"] = "Permissions";
$lang["employees_repeat_password"] = "Password Again";
$lang["employees_subpermission_required"] = "Add at least one grant for each module";
$lang["employees_successful_adding"] = "You have successfully added employee";
$lang["employees_successful_adding"] = "You have successfully added Employee";
$lang["employees_successful_change_password"] = "Password successfully changed";
$lang["employees_successful_deleted"] = "You have successfully deleted a Giftcard";
$lang["employees_successful_updating"] = "You have successfully updated employee";
$lang["employees_successful_deleted"] = "You have successfully deleted Employee";
$lang["employees_successful_updating"] = "You have successfully updated Employee";
$lang["employees_unsuccessful_change_password"] = "Password unsuccessfully changed";
$lang["employees_update"] = "Update Employee";
$lang["employees_username"] = "Username";
$lang["employees_username_minlength"] = "The username must be at least 5 characters";
$lang["employees_username_minlength"] = "The Username must be at least 5 characters";
$lang["employees_username_required"] = "Username is a required field";

24
application/language/en-GB/giftcards_lang.php
View File

@@ -4,7 +4,7 @@ $lang["giftcards_add_minus"] = "Inventory to add/subtract";
$lang["giftcards_allow_alt_description"] = "Allow alt description";
$lang["giftcards_amazon"] = "Amazon";
$lang["giftcards_bulk_edit"] = "Bulk Edit";
$lang["giftcards_cannot_be_deleted"] = "Could not delete selected giftcards, one or more of the selected giftcards has sales.";
$lang["giftcards_cannot_be_deleted"] = "Could not delete selected Giftcard(s), one or more of the selected Giftcard(s) has sales";
$lang["giftcards_cannot_find_giftcard"] = "Cannot find any information about the Giftcard";
$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!";
$lang["giftcards_card_value"] = "Value";
@@ -13,18 +13,18 @@ $lang["giftcards_change_all_to_allow_alt_desc"] = "Allow alt desc for all";
$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Do Not Allow Alt Desc For All";
$lang["giftcards_change_all_to_serialized"] = "Change All To Serialised";
$lang["giftcards_change_all_to_unserialized"] = "Change All To Unserialised";
$lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit all the selected giftcards?";
$lang["giftcards_confirm_delete"] = "Are you sure you want to delete the selected giftcards?";
$lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit all the selected Giftcard(s)?";
$lang["giftcards_confirm_delete"] = "Are you sure you want to delete the selected Giftcard(s)?";
$lang["giftcards_cost_price"] = "Cost Price";
$lang["giftcards_count"] = "Update Inventory";
$lang["giftcards_current_quantity"] = "Current Quantity";
$lang["giftcards_description"] = "Description";
$lang["giftcards_details_count"] = "Inventory count details";
$lang["giftcards_do_nothing"] = "Do nothing";
$lang["giftcards_edit_fields_you_want_to_update"] = "Edit the fields you want to edit for all the selected giftcards";
$lang["giftcards_edit_fields_you_want_to_update"] = "Edit the fields you want to edit for all the selected Giftcard(s)";
$lang["giftcards_edit_multiple_giftcards"] = "Editing multiple Giftcards";
$lang["giftcards_error_adding_updating"] = "Error adding/updating Giftcard";
$lang["giftcards_error_updating_multiple"] = "Error updating Giftcards";
$lang["giftcards_error_updating_multiple"] = "Error updating Giftcard(s)";
$lang["giftcards_excel_import_failed"] = "The excel import failed";
$lang["giftcards_generate_barcodes"] = "Generate Barcodes";
$lang["giftcards_giftcard"] = "Giftcard";
@@ -34,12 +34,12 @@ $lang["giftcards_inventory_comments"] = "Comments";
$lang["giftcards_is_serialized"] = "Giftcard has Serial Number";
$lang["giftcards_low_inventory_giftcards"] = "Low Inventory Giftcards";
$lang["giftcards_manually_editing_of_quantity"] = "Manual Edit of Quantity";
$lang["giftcards_must_select_giftcard_for_barcode"] = "You must select at least 1 Giftcards to generate barcodes";
$lang["giftcards_must_select_giftcard_for_barcode"] = "You must select at least 1 Giftcard to generate barcodes";
$lang["giftcards_new"] = "New Giftcard";
$lang["giftcards_no_description_giftcards"] = "No description Giftcards";
$lang["giftcards_no_giftcards_to_display"] = "No Giftcards to display";
$lang["giftcards_none"] = "None";
$lang["giftcards_none_selected"] = "You have not selected any Giftcards to edit";
$lang["giftcards_none_selected"] = "You have not selected any Giftcard(s) to edit";
$lang["giftcards_number"] = "Giftcard Number must be a number";
$lang["giftcards_number_information"] = "Giftcard Number";
$lang["giftcards_number_required"] = "Giftcard Number is a required field";
@@ -53,10 +53,10 @@ $lang["giftcards_retrive_giftcard_info"] = "Retrieve Giftcard Info";
$lang["giftcards_sales_tax_1"] = "Sales Tax";
$lang["giftcards_sales_tax_2"] = "Sales Tax 2";
$lang["giftcards_serialized_giftcards"] = "Serialised Giftcards";
$lang["giftcards_successful_adding"] = "You have successfully added a Giftcard";
$lang["giftcards_successful_adding"] = "You have successfully added Giftcard";
$lang["giftcards_successful_bulk_edit"] = "You have successfully updated the selected Giftcards";
$lang["giftcards_successful_deleted"] = "You have successfully deleted a Giftcard";
$lang["giftcards_successful_updating"] = "You have successfully updated a Giftcard";
$lang["giftcards_successful_deleted"] = "You have successfully deleted Giftcard";
$lang["giftcards_successful_updating"] = "You have successfully updated Giftcard";
$lang["giftcards_supplier"] = "Supplier";
$lang["giftcards_tax_1"] = "Tax 1";
$lang["giftcards_tax_2"] = "Tax 2";
@@ -66,5 +66,5 @@ $lang["giftcards_unit_price"] = "Unit Price";
$lang["giftcards_upc_database"] = "Barcode Database";
$lang["giftcards_update"] = "Update Giftcard";
$lang["giftcards_use_inventory_menu"] = "Use Inv. Menu";
$lang["giftcards_value"] = "Giftcard value must be a number";
$lang["giftcards_value_required"] = "Giftcard value is a required field";
$lang["giftcards_value"] = "Giftcard Value must be a number";
$lang["giftcards_value_required"] = "Giftcard Value is a required field";

8
application/language/en-GB/item_kits_lang.php
View File

@@ -3,7 +3,7 @@
$lang["item_kits_add_item"] = "Add Item";
$lang["item_kits_all"] = "All";
$lang["item_kits_cannot_be_deleted"] = "Could not delete item kit(s)";
$lang["item_kits_confirm_delete"] = "Are you sure you want to delete the selected item kits?";
$lang["item_kits_confirm_delete"] = "Are you sure you want to delete the selected Item Kit(s)?";
$lang["item_kits_description"] = "Item Kit Description";
$lang["item_kits_discount_percent"] = "Discount Percent";
$lang["item_kits_error_adding_updating"] = "Error adding/updating Item Kit";
@@ -17,8 +17,8 @@ $lang["item_kits_kit_and_stock"] = "Kit and Stock";
$lang["item_kits_kit_only"] = "Kit Only";
$lang["item_kits_name"] = "Item Kit Name";
$lang["item_kits_new"] = "New Item Kit";
$lang["item_kits_no_item_kits_to_display"] = "No item kits to display";
$lang["item_kits_none_selected"] = "You have not selected any item kits";
$lang["item_kits_no_item_kits_to_display"] = "No Item Kits to display";
$lang["item_kits_none_selected"] = "You have not selected any Item Kit(s)";
$lang["item_kits_one_or_multiple"] = "Item Kit(s)";
$lang["item_kits_price_option"] = "Price Option";
$lang["item_kits_priced_only"] = "Priced Only";
@@ -26,6 +26,6 @@ $lang["item_kits_print_option"] = "Print Option";
$lang["item_kits_quantity"] = "Quantity";
$lang["item_kits_sequence"] = "Sequence";
$lang["item_kits_successful_adding"] = "You have successfully added Item Kit";
$lang["item_kits_successful_deleted"] = "You have successfully deleted a Giftcard";
$lang["item_kits_successful_deleted"] = "You have successfully deleted Item Kit";
$lang["item_kits_successful_updating"] = "You have successfully updated Item Kit";
$lang["item_kits_update"] = "Update Item Kit";

2
application/language/en-GB/items_lang.php
View File

@@ -87,7 +87,7 @@ $lang["items_stock_location"] = "Stock location";
$lang["items_stock_type"] = "Stock Type";
$lang["items_successful_adding"] = "You have successfully added item";
$lang["items_successful_bulk_edit"] = "You have successfully updated the selected items";
$lang["items_successful_deleted"] = "You have successfully deleted a Giftcard";
$lang["items_successful_deleted"] = "You have successfully deleted item";
$lang["items_successful_updating"] = "You have successfully updated item";
$lang["items_supplier"] = "Supplier";
$lang["items_tax_1"] = "Tax 1";

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

@@ -39,7 +39,7 @@ $lang["receivings_start_typing_supplier_name"] = "Start Typing supplier's name..
$lang["receivings_stock_destination"] = "Stock destination";
$lang["receivings_stock_locaiton"] = "Stock location";
$lang["receivings_stock_source"] = "Stock source";
$lang["receivings_successfully_deleted"] = "You have successfully deleted a Giftcard";
$lang["receivings_successfully_deleted"] = "You have successfully deleted receiving";
$lang["receivings_successfully_updated"] = "Receiving successfully updated";
$lang["receivings_supplier"] = "Supplier";
$lang["receivings_supplier_address"] = "Address";

6
application/language/en-GB/sales_lang.php
View File

@@ -33,8 +33,8 @@ $lang["sales_date_type"] = "Date field is required";
$lang["sales_debit"] = "Debit Card";
$lang["sales_delete_confirmation"] = "Are you sure you want to delete this sale? This action cannot be undone.";
$lang["sales_delete_entire_sale"] = "Delete entire sale";
$lang["sales_delete_successful"] = "You have successfully deleted a sale";
$lang["sales_delete_unsuccessful"] = "You have unsuccessfully deleted a sale";
$lang["sales_delete_successful"] = "You have successfully deleted sale";
$lang["sales_delete_unsuccessful"] = "You have unsuccessfully deleted sale";
$lang["sales_description_abbrv"] = "Desc";
$lang["sales_discard_quote"] = "Discard";
$lang["sales_discount"] = "Disc %";
@@ -121,7 +121,7 @@ $lang["sales_start_typing_customer_name"] = "Start typing customer's details..."
$lang["sales_start_typing_item_name"] = "Start typing item's name or scan barcode...";
$lang["sales_stock_location"] = "Stock location";
$lang["sales_sub_total"] = "Subtotal";
$lang["sales_successfully_deleted"] = "You have successfully deleted a Giftcard";
$lang["sales_successfully_deleted"] = "You have successfully deleted sale";
$lang["sales_successfully_suspended_sale"] = "Your sale has been successfully suspended";
$lang["sales_successfully_updated"] = "Sale successfully updated";
$lang["sales_suspend_sale"] = "Suspend";

16
application/language/en-GB/suppliers_lang.php
View File

@@ -2,17 +2,17 @@
$lang["suppliers_account_number"] = "Account #";
$lang["suppliers_agency_name"] = "Agency Name";
$lang["suppliers_cannot_be_deleted"] = "Could not delete the selected suppliers, one or more of the selected suppliers has sales.";
$lang["suppliers_cannot_be_deleted"] = "Could not delete the selected Supplier(s), one or more of the selected Supplier(s) has sales";
$lang["suppliers_company_name"] = "Company Name";
$lang["suppliers_company_name_required"] = "Company Name is a required field";
$lang["suppliers_confirm_delete"] = "Are you sure you want to delete the selected supplier(s)?";
$lang["suppliers_error_adding_updating"] = "Error adding/updating supplier";
$lang["suppliers_confirm_delete"] = "Are you sure you want to delete the selected Supplier(s)?";
$lang["suppliers_error_adding_updating"] = "Error adding/updating Supplier";
$lang["suppliers_new"] = "New Supplier";
$lang["suppliers_none_selected"] = "You have not selected any supplier(s) to delete";
$lang["suppliers_one_or_multiple"] = "supplier(s)";
$lang["suppliers_successful_adding"] = "You have successfully added supplier";
$lang["suppliers_successful_deleted"] = "You have successfully deleted a Giftcard";
$lang["suppliers_successful_updating"] = "You have successfully updated supplier";
$lang["suppliers_none_selected"] = "You have not selected any Supplier(s) to delete";
$lang["suppliers_one_or_multiple"] = "Supplier(s)";
$lang["suppliers_successful_adding"] = "You have successfully added Supplier";
$lang["suppliers_successful_deleted"] = "You have successfully deleted Supplier";
$lang["suppliers_successful_updating"] = "You have successfully updated Supplier";
$lang["suppliers_supplier"] = "Supplier";
$lang["suppliers_supplier_id"] = "Id";
$lang["suppliers_update"] = "Update Supplier";

12
application/language/en-GB/taxes_lang.php
View File

@@ -1,9 +1,9 @@
<?php
$lang["taxes_add_exception"] = "Add Exception";
$lang["taxes_confirm_delete"] = "Confirm deletion of tax code";
$lang["taxes_confirm_delete"] = "Confirm deletion of Tax Code";
$lang["taxes_default_tax_category"] = "Default Tax Category";
$lang["taxes_error_adding_updating"] = "Error adding/updating tax code";
$lang["taxes_error_adding_updating"] = "Error adding/updating Tax Code";
$lang["taxes_new"] = "New Tax Code";
$lang["taxes_no_taxes_to_display"] = "No taxes code available to display";
$lang["taxes_round_half_down"] = "Half Down";
@@ -16,12 +16,12 @@ $lang["taxes_sales_tax_by_invoice"] = "Sales Tax by Invoice";
$lang["taxes_successful_deleted"] = "You have successfully deleted";
$lang["taxes_tax_category"] = "Tax Category";
$lang["taxes_tax_code"] = "Tax Code";
$lang["taxes_tax_code_cannot_be_deleted"] = "Could not delete selected tax code";
$lang["taxes_tax_code_cannot_be_deleted"] = "Could not delete selected Tax Code";
$lang["taxes_tax_code_name"] = "Tax Code Name";
$lang["taxes_tax_code_required"] = "Tax code is a required field";
$lang["taxes_tax_code_successful_deleted"] = "You have successfully deleted tax code";
$lang["taxes_tax_code_required"] = "Tax Code is a required field";
$lang["taxes_tax_code_successful_deleted"] = "You have successfully deleted Tax Code";
$lang["taxes_tax_code_successful_updated"] = "You have successfully updated";
$lang["taxes_tax_code_successful_updating"] = "You have successfully updated tax code";
$lang["taxes_tax_code_successful_updating"] = "You have successfully updated Tax Code";
$lang["taxes_tax_code_successfully_added"] = "You have successfully added";
$lang["taxes_tax_code_type"] = "Tax Code Type";
$lang["taxes_tax_rate"] = "Tax Rate";

3
application/models/Giftcard.php
View File

@@ -76,7 +76,7 @@ class Giftcard extends CI_Model
}
/*
Gets an giftcard id given an giftcard number
Gets an giftcard id given a giftcard number
*/
public function get_giftcard_id($giftcard_number)
{
@@ -117,6 +117,7 @@ class Giftcard extends CI_Model
if($this->db->insert('giftcards', $giftcard_data))
{
$giftcard_data['giftcard_number'] = $this->db->insert_id();
$giftcard_data['giftcard_id'] = $this->db->insert_id();
return TRUE;
}

2
bower.json
View File

@@ -1,7 +1,7 @@
{
"name": "opensourcepos",
"description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
"version": "3.1.0",
"version": "3.1.1",
"license": "MIT",
"authors": [
"jekkos <jeroen.peelaerts - at - gmail.com>",

6
deployment.json
View File

@@ -1,5 +1,4 @@
{
"package": {
"name": "opensourcepos",
"repo": "opensourcepos",
@@ -14,10 +13,9 @@
"public_download_numbers": true,
"public_stats": true
},
"version": {
"name": "3.1.0"
"version": {
"name": "3.1.1"
},
"files":
[
{"includePattern": "dist(.*)\\.(zip)", "uploadPattern": "$1.$2"}

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "opensourcepos",
"version": "3.1.0",
"version": "3.1.1",
"description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
"main": "index.php",
"license": "MIT",