Update WHATS_NEW.txt with 3.0.2 improvements

Don't load item avatar if item_pic is empty

.travis.yml

@@ -12,10 +12,8 @@ before_install:
     - sudo mv docker-compose /usr/local/bin
 script:
     - docker-compose build
-    - docker-compose up -d
 env: 
     - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
 after_success:
-    - 
     - '[ -n ${DOCKER_USERNAME} ] && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag opensourcepos_php "jekkos/opensourcepos:$TAG" && docker tag opensourcepos_sqlscript jekkos/opensourcepos:sqlscript && docker push "jekkos/opensourcepos:$TAG" &&  docker push jekkos/opensourcepos:sqlscript'
 

Dockerfile

@@ -4,17 +4,17 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     php5-apcu \
     libicu-dev \
     libgd-dev \
-    sendmail
+    libmcrypt-dev
 
 RUN a2enmod rewrite
-RUN docker-php-ext-install mysql mysqli bcmath intl gd sockets mbstring
+RUN docker-php-ext-install mysql mysqli bcmath intl gd sockets mbstring mcrypt
 RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini
 RUN echo -e “$(hostname -i)\t$(hostname) $(hostname).localhost” >> /etc/hosts
 
 WORKDIR /app
 COPY . /app
 RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html
-RUN chmod 775 /app/public/uploads
+RUN chmod 755 /app/public/uploads && chown -R www-data:www-data /app/public/uploads
 
 RUN cp application/config/database.php.tmpl application/config/database.php && \
     sed -i -e "s/\(localhost\)/web/g" test/ospos.js && \

README.md

@@ -25,7 +25,7 @@ The main features are:
 
 The software is written in PHP language, it uses MySQL or MariaDB as data storage back-end and has a simple but intuitive user interface.
 
-The latest version 3.0.1 is a complete overhaul of the original software.
+The latest version 3.0.2 is a complete overhaul of the original software.
 It is now based on Bootstrap 3.x using Bootswatch themes, and still uses CodeIgniter 3.x as framework.
 It also has improved functionality and security.
 

WHATS_NEW.txt

@@ -1,3 +1,12 @@
+Version 3.0.2
+-----------
++ Fixed error when performing scans multiple times in a row
++ Fixed summary reports
++ Protect Employee privacy printing just the first letter of the family name
++ Updates to language translations
++ Various Dockers support improvements
++ Minor bugfixes
+
 Version 3.0.1
 -----------
 + *CodeIgniter 3.1.2 Upgrade*

application/config/config.php

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

application/controllers/Items.php

@@ -190,8 +190,11 @@ class Items extends Secure_Controller
 		$data['selected_supplier'] = $item_info->supplier_id;
 
 		$data['logo_exists'] = $item_info->pic_id != '';
-		$images = glob('./uploads/item_pics/' . $item_info->pic_id . '.*');
-		$data['image_path'] = sizeof($images) > 0 ? base_url($images[0]) : '';
+		if (!empty($item_info->pic_id))
+		{
+			$images = glob('./uploads/item_pics/' . $item_info->pic_id . '.*');
+			$data['image_path'] = sizeof($images) > 0 ? base_url($images[0]) : '';
+		}
 
 		$stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
         foreach($stock_locations as $location)

application/controllers/Sales.php

@@ -366,7 +366,7 @@ class Sales extends Secure_Controller
 		$data['amount_due'] = $this->sale_lib->get_amount_due();
 		$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
 		$employee_info = $this->Employee->get_info($employee_id);
-		$data['employee'] = $employee_info->first_name  . ' ' . $employee_info->last_name;
+		$data['employee'] = $employee_info->first_name  . ' ' . $employee_info->last_name[0];
 		$data['company_info'] = implode("\n", array(
 			$this->config->item('address'),
 			$this->config->item('phone'),
@@ -608,7 +608,7 @@ class Sales extends Secure_Controller
 		$data['amount_change'] = $this->sale_lib->get_amount_due() * -1;
 		$data['amount_due'] = $this->sale_lib->get_amount_due();
 		$employee_info = $this->Employee->get_info($this->sale_lib->get_employee());
-		$data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
+		$data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name[0];
 		$this->_load_customer_data($this->sale_lib->get_customer(), $data);
 
 		$data['sale_id_num'] = $sale_id;

application/language/hu-HU/config_lang.php

@@ -2,7 +2,7 @@
 
 $lang["config_address"] = "Cég cím";
 $lang["config_address_required"] = "Cég cím kötelező mező";
-$lang["config_apostrophe"] = "apostrophe";
+$lang["config_apostrophe"] = "aposztrof";
 $lang["config_backup_button"] = "Mentés";
 $lang["config_backup_database"] = "Adatbázis mentése";
 $lang["config_barcode"] = "Vonalkód";
@@ -27,8 +27,8 @@ $lang["config_barcode_third_row"] = "Sor 3";
 $lang["config_barcode_type"] = "Vonalkód tipus";
 $lang["config_barcode_width"] = "Szélesség (px)";
 $lang["config_barcode_generate_if_empty"] = "Generáljon ha üres";
-$lang["config_bottom"] = "Bottom";
-$lang["config_center"] = "Center";
+$lang["config_bottom"] = "Alul";
+$lang["config_center"] = "Közép";
 $lang["config_company"] = "Cégnév";
 $lang["config_company_logo"] = "Cég logó";
 $lang["config_company_select_image"] = "Kép kiválasztása";
@@ -36,7 +36,7 @@ $lang["config_company_change_image"] = "Kép cseréje";
 $lang["config_company_remove_image"] = "Kép eltávolítása";
 $lang["config_company_required"] = "Cégnév kötelező mező";
 $lang["config_company_website_url"] = "A cég webcime nem érvényes URL (http://...)";
-$lang["config_comma"] = "comma";
+$lang["config_comma"] = "vessző";
 $lang["config_country_codes"] = "Country Codes";
 $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup.";
 $lang["config_currency_symbol"] = "Pénznem";
@@ -76,15 +76,15 @@ $lang["config_default_tax_rate_2"] = "Adó 2";
 $lang["config_default_tax_rate_number"] = "Az alapértelmezett adónak számnak kell lennie";
 $lang["config_default_tax_rate_required"] = "Az alapértelmezett adó kötelező mező";
 $lang["config_default_tax_name_required"] = "Alapértelmezett adó név kötelező mező";
-$lang["config_dot"] = "dot";
+$lang["config_dot"] = "pont";
 $lang["config_email"] = "Email";
-$lang["config_email_configuration"] = "Email Configuration";
-$lang["config_email_protocol"] = "Protocol";
-$lang["config_email_mailpath"] = "Path to Sendmail";
-$lang["config_email_smtp_host"] = "SMTP Server";
+$lang["config_email_configuration"] = "Email beállítás";
+$lang["config_email_protocol"] = "Protokoll";
+$lang["config_email_mailpath"] = "Sendmail elérési út";
+$lang["config_email_smtp_host"] = "SMTP Szerver";
 $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_crypto"] = "SMTP Encryption";
-$lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
+$lang["config_email_smtp_timeout"] = "SMTP időtúllépést (mp)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_email_smtp_pass"] = "SMTP Password";
 $lang["config_fax"] = "Fax";
@@ -95,14 +95,14 @@ $lang["config_info_configuration"] = "Bolt információk";
 $lang["config_invoice"] = "Számla";
 $lang["config_invoice_configuration"] = "Nyomtatási beállitások";
 $lang["config_invoice_default_comments"] = "Alapértelmezett számla kommentek";
-$lang["config_invoice_enable"] = "Enable Invoicing";
+$lang["config_invoice_enable"] = "Számlázás engedélyezése";
 $lang["config_invoice_email_message"] = "Email számla sablon";
 $lang["config_invoice_printer"] = "Számla nyomtató";
 $lang["config_jsprintsetup_required"] = "Figyelem! Ez a letiltott funkció csak akkor működik megfelelően, ha a FireFox jsPrintSetup kiegészítő telepítve van. Menti mindezek tudatában?";
 $lang["config_language"] = "Nyelv";
-$lang["config_left"] = "Left";
-$lang["config_license"] = "License";
-$lang["config_license_configuration"] = "License Statement";
+$lang["config_left"] = "Bal";
+$lang["config_license"] = "Licensz";
+$lang["config_license_configuration"] = "Licensz statementek";
 $lang["config_lines_per_page"] = "Sorok száma  oldalanként";
 $lang["config_lines_per_page_number"] = "A sorok száma oldalanként kötelező mező";
 $lang["config_lines_per_page_required"] = "A sor per oldal kötelező mező";
@@ -113,15 +113,15 @@ $lang["config_location"] = "Készlet";
 $lang["config_location_configuration"] = "Készlet helye";
 $lang["config_location_info"] = "Helyszin konfigurációs információk";
 $lang["config_logout"] = "Nem szeretne mentést csinálni kilépés előtt? Kattintson az [OK]-ra a mentéshez, [Mégsem] a kilépéshez";
-$lang["config_message"] = "Message";
-$lang["config_message_configuration"] = "Message Configuration";
-$lang["config_msg_msg"] = "Saved Text Message";
-$lang["config_msg_msg_placeholder"] = "If you wish to use a SMS template save your message here. Otherwise leave the box blank.";
-$lang["config_msg_uid"] = "SMS-API Username";
-$lang["config_msg_uid_required"] = "SMS-API Username is a required field";
-$lang["config_msg_pwd"] = "SMS-API Password";
-$lang["config_msg_pwd_required"] = "SMS-API Password is a required field";
-$lang["config_msg_src"] = "SMS-API Sender ID";
+$lang["config_message"] = "Üzenet";
+$lang["config_message_configuration"] = "Üzenet beállítások";
+$lang["config_msg_msg"] = "Mentett text üzenet";
+$lang["config_msg_msg_placeholder"] = "Ha SMS alapot kíván használni ide írja. Egyébként hagyja üresen a mezőt.";
+$lang["config_msg_uid"] = "SMS-API Felhasználó";
+$lang["config_msg_uid_required"] = "SMS-API Username kötelező mező";
+$lang["config_msg_pwd"] = "SMS-API Jelszó";
+$lang["config_msg_pwd_required"] = "SMS-API jelszó kötelező mező";
+$lang["config_msg_src"] = "SMS-API Küldö ID";
 $lang["config_msg_src_required"] = "SMS-API Sender ID is a required field";
 $lang["config_none"] = "none";
 $lang["config_notify_alignment"] = "Notification Popup Position";
@@ -151,20 +151,20 @@ $lang["config_receipt_info"] = "Nyugta beállítási információk";
 $lang["config_receipt_printer"] = "Jegy nyomtató";
 $lang["config_receipt_show_taxes"] = "Adók mutatása";
 $lang["config_receipt_show_total_discount"] = "Összes kedvezmény mutatása";
-$lang["config_receipt_show_description"] = "Show Description";
-$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
-$lang["config_receipt_template"] = "Receipt Template";
-$lang["config_receipt_default"] = "Default";
-$lang["config_receipt_short"] = "Short";
+$lang["config_receipt_show_description"] = "Leírás mutatása";
+$lang["config_receipt_show_serialnumber"] = "Szériaszám mutatása";
+$lang["config_receipt_template"] = "Nyugta template";
+$lang["config_receipt_default"] = "Alapértelmezett";
+$lang["config_receipt_short"] = "Rövid";
 $lang["config_receiving_calculate_average_price"] = "Átl. Ár számitása (visszáru)";
 $lang["config_recv_invoice_format"] = "Visszatérítési számla formátum";
 $lang["config_return_policy_required"] = "Return policy is a required field";
-$lang["config_right"] = "Right";
+$lang["config_right"] = "Jobb";
 $lang["config_sales_invoice_format"] = "Eladási számla formátum";
 $lang["config_saved_successfully"] = "Beállítások sikeresen elmentve";
 $lang["config_saved_unsuccessfully"] = "Beállítások mentése sikertelen";
-$lang["config_statistics"] = "Send statistics";
-$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
+$lang["config_statistics"] = "Statisztika küldése";
+$lang["config_statistics_tooltip"] = "Statisztika küldése fejlesztési célból";
 $lang["config_stock_location"] = "Bolt helye";
 $lang["config_stock_location_duplicate"] = "Kérem egyedi helyszin nevet használjon";
 $lang["config_stock_location_invalid_chars"] = "A bolt helyének neve nem tartalmazhat '_' karaktert";
@@ -174,11 +174,11 @@ $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_included"] = "Adókat tartalmaz";
 $lang["config_thousands_separator"] = "Ezres elválasztó";
 $lang["config_timezone"] = "Időzóna";
-$lang["config_top"] = "Top";
+$lang["config_top"] = "Felül";
 $lang["config_website"] = "Weboldal";
 $lang["config_number_locale"] = "Lokalizációs";
 $lang["config_return_policy_required"] = "Return policy is a required field";
-$lang["config_number_locale_required"] = "Number Locale is a required field";
-$lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a sensible value";
+$lang["config_number_locale_required"] = "Lokalizációs szám kötelező mező";
+$lang["config_number_locale_invalid"] = "A megadott érték érvénytelen. Ellenőrizze a linken a megadható értékeket.";
 $lang["config_number_locale_tooltip"] = "Find a suitable locale through this link";
-$lang["config_theme"] = "Theme";
+$lang["config_theme"] = "Téma";

application/language/hu-HU/messages_lang.php

@@ -6,7 +6,7 @@ $lang["messages_last_name"] = "Vezetéknév";
 $lang["messages_phone"] = "Telefonszám";
 $lang["messages_phone_placeholder"] = "Mobil telefonszám(ok) ide...";
 $lang["messages_phone_number_required"] = "Telefonszám kötelező";
-$lang["messages_message"] = "Message";
+$lang["messages_message"] = "Üzenet";
 $lang["messages_message_placeholder"] = "Az Ön üzente...";
 $lang["messages_message_required"] = "Üzenet kötelező";
 $lang["messages_multiple_phones"] = "(Több címzett esetében a telefonszámokat vesszővel válassza el)";

application/language/nl-BE/customers_lang.php

@@ -6,7 +6,7 @@ $lang["customers_cannot_be_deleted"] = "De geselecteerde klanten konden niet wor
 $lang["customers_company_name"] = "Bedrijfsnaam";
 $lang["customers_confirm_delete"] = "Bent u zeker dat u de geselecteerde klanten wil verwijderen?";
 $lang["customers_customer"] = "Klant";
-$lang["customers_discount"] = "Discount";
+$lang["customers_discount"] = "Korting";
 $lang["customers_error_adding_updating"] = "Fout bij het toevoegen/bewerken van een klant";
 $lang["customers_new"] = "Nieuwe Klant";
 $lang["customers_none_selected"] = "U hebt geen klanten geselecteerd";
@@ -15,7 +15,7 @@ $lang["customers_successful_adding"] = "Klant succesvol aangemaakt";
 $lang["customers_successful_deleted"] = "Er werd(en)";
 $lang["customers_successful_updating"] = "Wijzigingen klantgegevens bewaard voor ";
 $lang["customers_taxable"] = "Belastbaar";
-$lang["customers_total"] = "Total";
+$lang["customers_total"] = "Totaal";
 $lang["customers_update"] = "Bewerk Klant";
 $lang["customers_import_items_excel"] = "Import customers from Excel sheet";
 $lang["customers_excel_import_failed"] = "Excel import mislukt";

application/language/nl-BE/employees_lang.php

@@ -1,12 +1,13 @@
 <?php 
 
-$lang["employees_basic_information"] = "Information";
-$lang["employees_cannot_be_deleted"] = "Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)";
+$lang["employees_basic_information"] = "Informatie";
+$lang["employees_cannot_be_deleted"] = "Kan geselecteerde medewerker niet verwijderen, de medewerker heeft een of meerdere verkopen afgehandeld of je probeerd je zelf te verwijderen :)
+Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)";
 $lang["employees_confirm_delete"] = "Bent u zeker dat u de geselecteerde werknemers wil verwijderen?";
 $lang["employees_employee"] = "Werknemer";
-$lang["employees_error_adding_updating"] = "Error adding/updating employee";
-$lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user";
-$lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user";
+$lang["employees_error_adding_updating"] = "Fout tijden toevoegen/aanpassen medewerker";
+$lang["employees_error_deleting_demo_admin"] = "Je kan de demo admin niet verwijderen";
+$lang["employees_error_updating_demo_admin"] = "Jij kan de demo admin gebruiker niet veranderen";
 $lang["employees_login_info"] = "Login";
 $lang["employees_new"] = "N. Werknemer";
 $lang["employees_none_selected"] = "U hebt geen werknemers geselecteerd";
@@ -15,12 +16,12 @@ $lang["employees_password"] = "Paswoord";
 $lang["employees_password_minlength"] = "Paswoord moet minstens 8 characters lang zijn";
 $lang["employees_password_must_match"] = "Paswoorden komen niet overeen";
 $lang["employees_password_required"] = "Paswoord moet ingevuld worden";
-$lang["employees_permission_desc"] = "Check the boxes below to grant access to modules";
-$lang["employees_permission_info"] = "Permissions";
+$lang["employees_permission_desc"] = "Vink de vierkantjes hieronder aan om toegang te verlenen tot de modules";
+$lang["employees_permission_info"] = "Rechten";
 $lang["employees_repeat_password"] = "Herhaal Paswoord";
-$lang["employees_successful_adding"] = "You have successfully added employee";
+$lang["employees_successful_adding"] = "Je hebt met succes een medewerker toegevoegd";
 $lang["employees_successful_deleted"] = "Er werd(en)";
-$lang["employees_successful_updating"] = "You have successfully updated employee";
+$lang["employees_successful_updating"] = "Je hebt met succes de medewerker gewijzigd";
 $lang["employees_update"] = "Update Werknemer";
 $lang["employees_username"] = "Gebruikersnaam";
 $lang["employees_username_minlength"] = "Gebruikersnaam moet minstens 5 characters lang zijn";

application/language/nl-BE/giftcards_lang.php

@@ -47,7 +47,7 @@ $lang["giftcards_one_or_multiple"] = "cadeaubon(s) verwijderd";
 $lang["giftcards_person_id"] = "Klant";
 $lang["giftcards_quantity"] = "In stock";
 $lang["giftcards_quantity_required"] = "Hoeveelheid moet ingevuld worden. Druk Sluit ( X ) om te annuleren";
-$lang["giftcards_reorder_level"] = "Reorder Level";
+$lang["giftcards_reorder_level"] = "Bestel niveau";
 $lang["giftcards_retrive_giftcard_info"] = "Haal Info Op";
 $lang["giftcards_sales_tax_1"] = "VAT";
 $lang["giftcards_sales_tax_2"] = "VAT 2";

application/language/nl-BE/items_lang.php

@@ -61,7 +61,7 @@ $lang["items_quantity"] = "Stock";
 $lang["items_quantity_number"] = "Hoeveelheid moet een cijfer zijn";
 $lang["items_quantity_required"] = "Hoeveelheid moet ingevuld worden";
 $lang["items_receiving_quantity"] = "Aantal per lijn";
-$lang["items_reorder_level"] = "Reorder Level";
+$lang["items_reorder_level"] = "Bestel niveau";
 $lang["items_reorder_level_number"] = "Reorder level moet een cijfer zijn";
 $lang["items_reorder_level_required"] = "Reorder level moet ingevuld worden";
 $lang["items_retrive_item_info"] = "Haal productinformatie op";

application/language/nl-BE/messages_lang.php

@@ -1,14 +1,14 @@
 <?php 
 
 $lang["messages_sms_send"] = "Send SMS";
-$lang["messages_first_name"] = "First name";
-$lang["messages_last_name"] = "Last name";
-$lang["messages_phone"] = "Phone number";
-$lang["messages_phone_placeholder"] = "Mobile Number(s) here...";
-$lang["messages_phone_number_required"] = "Phone number required";
+$lang["messages_first_name"] = "Voornaam";
+$lang["messages_last_name"] = "Achternaam";
+$lang["messages_phone"] = "Telefoonnummer";
+$lang["messages_phone_placeholder"] = "Mobiele nummer(s) hier...";
+$lang["messages_phone_number_required"] = "Telefoonnummer verplicht";
 $lang["messages_message"] = "Message";
-$lang["messages_message_placeholder"] = "Your Message here...";
-$lang["messages_message_required"] = "Message required";
-$lang["messages_multiple_phones"] = "(In case of multiple recipients, enter mobile numbers separated by commas)";
-$lang["messages_successfully_sent"] = "Message successfully sent to: ";
-$lang["messages_unsuccessfully_sent"] = "Message unsuccessfully sent to: ";
+$lang["messages_message_placeholder"] = "Jou bericht hier..";
+$lang["messages_message_required"] = "Bericht verplicht";
+$lang["messages_multiple_phones"] = "(In het geval van meerdere ontvangers, voer de mobiele nummers gescheiden door komma's in)";
+$lang["messages_successfully_sent"] = "Bericht met succes verzonden naar: ";
+$lang["messages_unsuccessfully_sent"] = "Bericht zonder succes verzonden naar: ";

application/language/nl-BE/reports_lang.php

@@ -44,14 +44,14 @@ $lang["reports_payment_type"] = "Betaald";
 $lang["reports_payments"] = "Betalingen";
 $lang["reports_payments_summary_report"] = "Overzicht Betalingen";
 $lang["reports_profit"] = "Winst";
-$lang["reports_cost"] = "Cost";
+$lang["reports_cost"] = "Kosten";
 $lang["reports_quantity"] = "Stock";
 $lang["reports_quantity_purchased"] = "Aangekochte Hoeveelheid";
 $lang["reports_received_by"] = "Ontvangen door";
 $lang["reports_receiving_id"] = "";
 $lang["reports_receiving_type"] = "";
 $lang["reports_receivings"] = "Orders";
-$lang["reports_reorder_level"] = "Reorder Level";
+$lang["reports_reorder_level"] = "Bestel niveau";
 $lang["reports_report"] = "Rapport";
 $lang["reports_report_input"] = "Input Rapport";
 $lang["reports_reports"] = "Rapporten";
@@ -69,7 +69,7 @@ $lang["reports_revenue"] = "Inkomsten";
 $lang["reports_sale_id"] = "Ticket°";
 $lang["reports_sale_type"] = "Type";
 $lang["reports_sales"] = "Verkoop";
-$lang["reports_sales_amount"] = "Sales amount";
+$lang["reports_sales_amount"] = "Verkoopbedrag";
 $lang["reports_sales_summary_report"] = "Overzicht Verkoop";
 $lang["reports_serial_number"] = "Nummer";
 $lang["reports_sold_by"] = "Werknemer";
@@ -87,7 +87,7 @@ $lang["reports_taxes"] = "Belastingen";
 $lang["reports_taxes_summary_report"] = "Rapport Overzicht Belastingen";
 $lang["reports_total"] = "Totaal";
 $lang["reports_type"] = "Type";
-$lang["reports_item_count"] = "Filter Item Count";
+$lang["reports_item_count"] = "Filter product aantal";
 $lang["reports_cost_price"] = "Aankoopprijs";
 $lang["reports_unit_price"] = "Verkoopprijs";
 $lang["reports_sub_total_value"] = "Subtotaal";

application/language/nl-BE/sales_lang.php

@@ -18,8 +18,8 @@ $lang["sales_customer"] = "Klant";
 $lang["sales_customer_email"] = "Customer Email";
 $lang["sales_customer_address"] = "Customer Address";
 $lang["sales_customer_location"] = "Customer Location";
-$lang["sales_customer_discount"] = "Discount";
-$lang["sales_customer_total"] = "Total";
+$lang["sales_customer_discount"] = "Korting";
+$lang["sales_customer_total"] = "Totaal";
 $lang["sales_date"] = "Datum";
 $lang["sales_date_required"] = "Gelieve een correcte datum in te vullen";
 $lang["sales_date_type"] = "Er moet een correcte datum ingevuld worden";

application/models/reports/Summary_categories.php

@@ -44,4 +44,4 @@ class Summary_categories extends Summary_report
 		$this->db->order_by('category');
 	}
 }
-?>
+?>

application/models/reports/Summary_customers.php

@@ -44,4 +44,4 @@ class Summary_customers extends Summary_report
 		$this->db->order_by('customer_p.last_name');
 	}
 }
-?>
+?>

application/models/reports/Summary_discounts.php

@@ -32,4 +32,4 @@ class Summary_discounts extends Summary_report
 		return $this->db->get()->result_array();		
 	}
 }
-?>
+?>

application/models/reports/Summary_employees.php

@@ -44,4 +44,4 @@ class Summary_employees extends Summary_report
 		$this->db->order_by('employee_p.last_name');
 	}
 }
-?>
+?>

application/models/reports/Summary_items.php

@@ -44,4 +44,4 @@ class Summary_items extends Summary_report
 		$this->db->order_by('items.name');
 	}
 }
-?>
+?>

application/models/reports/Summary_payments.php

@@ -16,25 +16,30 @@ class Summary_payments extends Summary_report
 			array('report_count' => $this->lang->line('reports_count')),
 			array('amount_tendered' => $this->lang->line('sales_amount_tendered'), 'sorter' => 'number_sorter'));
 	}
-	
+
+	protected function _where(array $inputs)
+	{
+		$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+	}
+
 	public function getData(array $inputs)
 	{
-		$this->db->select('sales_payments.payment_type, count(*) AS count, SUM(payment_amount) AS payment_amount');
-		$this->db->from('sales_payments');
+		$this->db->select('sales_payments.payment_type, count(*) AS count, SUM(sales_payments.payment_amount) AS payment_amount');
+		$this->db->from('sales_payments AS sales_payments');
 		$this->db->join('sales AS sales', 'sales.sale_id = sales_payments.sale_id');
 
 		$this->_where($inputs);
 
 		$this->db->group_by("payment_type");
-		
+
 		$payments = $this->db->get()->result_array();
-		
+
 		// consider Gift Card as only one type of payment and do not show "Gift Card: 1, Gift Card: 2, etc." in the total
 		$gift_card_count = 0;
 		$gift_card_amount = 0;
 		foreach($payments as $key=>$payment)
-		{		
-			if( strstr($payment['payment_type'], $this->lang->line('sales_giftcard')) != FALSE )
+		{
+			if(strstr($payment['payment_type'], $this->lang->line('sales_giftcard')) != FALSE)
 			{
 				$gift_card_count  += $payment['count'];
 				$gift_card_amount += $payment['payment_amount'];
@@ -48,8 +53,8 @@ class Summary_payments extends Summary_report
 		{
 			$payments[] = array('payment_type' => $this->lang->line('sales_giftcard'), 'count' => $gift_card_count, 'payment_amount' => $gift_card_amount);
 		}
-		
+
 		return $payments;
 	}
 }
-?>
+?>

application/models/reports/Summary_report.php

@@ -73,17 +73,17 @@ abstract class Summary_report extends Report
 
 		if($inputs['location_id'] != 'all')
 		{
-			$this->db->where('item_location', $inputs['location_id']);
+			$this->db->where('sales_items.item_location', $inputs['location_id']);
 		}
 
 		if($inputs['sale_type'] == 'sales')
-        {
-            $this->db->where('quantity_purchased > 0');
-        }
-        elseif($inputs['sale_type'] == 'returns')
-        {
-            $this->db->where('quantity_purchased < 0');
-        }
+		{
+			$this->db->where('sales_items.quantity_purchased >= 0');
+		}
+		elseif($inputs['sale_type'] == 'returns')
+		{
+			$this->db->where('sales_items.quantity_purchased < 0');
+		}
 	}
 
 	/*
@@ -129,9 +129,9 @@ abstract class Summary_report extends Report
 
 		$this->_common_from();
 
-		$this->_common_where($inputs);
+		$this->_where($inputs);
 
 		return $this->db->get()->row_array();		
 	}
 }
-?>
+?>

application/models/reports/Summary_sales.php

@@ -26,7 +26,7 @@ class Summary_sales extends Summary_report
 		parent::_select($inputs);
 
 		$this->db->select('
-				DATE(sales.sale_time) AS sale_date, 
+				DATE(sales.sale_time) AS sale_date,
 				SUM(sales_items.quantity_purchased) AS quantity_purchased
 		');
 	}
@@ -37,4 +37,4 @@ class Summary_sales extends Summary_report
 		$this->db->order_by('sale_date');
 	}
 }
-?>
+?>

application/models/reports/Summary_suppliers.php

@@ -46,4 +46,4 @@ class Summary_suppliers extends Summary_report
 		$this->db->order_by('supplier_p.last_name');
 	}
 }
-?>
+?>

application/models/reports/Summary_taxes.php

@@ -19,24 +19,13 @@ class Summary_taxes extends Summary_report
 			array('total' => $this->lang->line('reports_total'), 'sorter' => 'number_sorter'));
 	}
 
+	protected function _where(array $inputs)
+	{
+		$this->db->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+	}
+
 	public function getData(array $inputs)
 	{
-		$quantity_cond = '';
-
-		if($inputs['sale_type'] == 'sales')
-		{
-			$quantity_cond = 'AND quantity_purchased > 0';
-		}
-		elseif($inputs['sale_type'] == 'returns')
-		{
-			$quantity_cond = 'AND quantity_purchased < 0';
-		}
-
-		if($inputs['location_id'] != 'all')
-		{
-			$quantity_cond .= 'AND item_location = '. $this->db->escape($inputs['location_id']);
-		}
-
 		if($this->config->item('tax_included'))
 		{
 			$sale_total = '(sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount_percent / 100))';
@@ -64,12 +53,12 @@ class Summary_taxes extends Summary_report
 						ON sales_items.sale_id = sales.sale_id
 					LEFT OUTER JOIN ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes
 						ON sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line
-					WHERE DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']) . " $quantity_cond
+					WHERE DATE(sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']) . '
 				) AS temp_taxes
-			GROUP BY percent"
+			GROUP BY percent'
 		);
 
 		return $query->result_array();
 	}
 }
-?>
+?>

application/views/partial/header_js.php

@@ -44,6 +44,13 @@
 		}
 	});
 
+	var submit = $.fn.submit;
+
+	$.fn.submit = function() {
+		setup_csrf_token();
+		submit.apply(this, arguments);
+	};
+
 	session_sha1 = '<?php echo $this->session->userdata('session_sha1'); ?>';
 
 </script>

bower.json

@@ -1,7 +1,7 @@
 {
-  "name": "OpenSourcePOS",
+  "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.0.1",
+  "version": "3.0.2",
   "license": "MIT",
   "authors": [
     "jekkos <jeroen.peelaerts - at - gmail.com>",

composer.json

@@ -1,7 +1,7 @@
 {
-	"name": "OpenSourcePOS",
+	"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.0.1",
+	"version": "3.0.2",
     "license": "MIT",
 	"authors": [
         {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensourcepos",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "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",