diff --git a/application/config/config.php b/application/config/config.php index cf9f35cbd..32cfc75d9 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -8,7 +8,7 @@ | | */ -$config['application_version'] = '3.1.0'; +$config['application_version'] = '3.1.1'; /* |-------------------------------------------------------------------------- diff --git a/application/language/en-GB/customers_lang.php b/application/language/en-GB/customers_lang.php index 9a515b99d..4f4107d4b 100644 --- a/application/language/en-GB/customers_lang.php +++ b/application/language/en-GB/customers_lang.php @@ -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"; diff --git a/application/language/en-GB/employees_lang.php b/application/language/en-GB/employees_lang.php index a95ec1fb8..00553d602 100644 --- a/application/language/en-GB/employees_lang.php +++ b/application/language/en-GB/employees_lang.php @@ -1,19 +1,19 @@ db->insert('giftcards', $giftcard_data)) { $giftcard_data['giftcard_number'] = $this->db->insert_id(); + $giftcard_data['giftcard_id'] = $this->db->insert_id(); return TRUE; } diff --git a/bower.json b/bower.json index ffef8633b..d96839b54 100644 --- a/bower.json +++ b/bower.json @@ -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 ", diff --git a/deployment.json b/deployment.json index e3e03d9cb..18cf5dad6 100644 --- a/deployment.json +++ b/deployment.json @@ -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"} diff --git a/package.json b/package.json index 7b6ab3b37..284ec41aa 100644 --- a/package.json +++ b/package.json @@ -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",