Commit Graph

  • 1b5105f3af Remove unnecessary hook with csrf setup (#599, #597) jekkos 2016-07-04 23:36:08 +02:00
  • 7b674b2e3f Fix submit in items, customers and sales (#716) Add again new button functionality in items (#712) Bugfixes for csrf tokens (#599) jekkos 2016-07-04 21:42:02 +02:00
  • 01486fd41e Fixed translation strings typos in datepicker_locale FrancescoUK 2016-07-04 18:59:56 +01:00
  • a69194745e Fixed template header issues (#714), and email_config tab js issue FrancescoUK 2016-07-04 18:12:20 +01:00
  • 90660fd9e9 Fix close button in stock details (#14) jekkos 2016-07-04 18:03:25 +02:00
  • bb1a1ccd62 Fix table_helper after bad merge jekkos 2016-07-04 17:45:08 +02:00
  • 806c1b9986 Add csrf token in forms (#599, #597) jekkos 2016-07-04 17:33:39 +02:00
  • 0ba5cadbb7 More models/Sale refactoring, fix button order in sales/form, make inventory count button a close one FrancescoUK 2016-07-03 20:23:06 +01:00
  • 5b81ee1b1d Added config_email_configuration translation (#713) FrancescoUK 2016-07-03 18:29:25 +01:00
  • c136832db1 Fixed issue with negative tendered amount in sales (#707), improved sales_items_temp table and usage in various parts FrancescoUK 2016-07-03 14:07:46 +01:00
  • d8beedf1f7 Small code optimisation: review for loops (#709) FrancescoUK 2016-07-01 19:12:48 +01:00
  • 4d6a665e04 Small code optimisation: use strtr instead of str_replace (#709) FrancescoUK 2016-07-01 18:57:07 +01:00
  • 201e26e521 Small code optimisation: pre increment is faster than post increment (#709) FrancescoUK 2016-07-01 17:47:35 +01:00
  • b7cb5c5873 make consistent use of elseif in place of else if FrancescoUK 2016-07-01 17:08:01 +01:00
  • 5cb755b0e3 Added common_close translation (#705) fixed datepicker_lang translation FrancescoUK 2016-07-01 09:11:36 +01:00
  • 43da232557 Tidy up time conversion utility functions FrancescoUK 2016-06-30 11:17:23 +01:00
  • 06c74045be Make full use of moment.js for wall clock functionality. Update templates/spacelab header.php FrancescoUK 2016-06-30 11:11:19 +01:00
  • ad54e759f0 Add badge for bower dependency status jekkos 2016-06-28 22:42:12 +02:00
  • 163726abae Fix docker cloud deploy button (#616) jekkos 2016-06-28 20:08:05 +02:00
  • 6a108866f5 Remove volume from docker-compose test file (#616) Update docker-cloud to mount init script directly jekkos 2016-06-28 19:21:42 +02:00
  • 608b2ec075 Add version + dependency badges jekkos 2016-06-28 13:47:36 +02:00
  • 7682f02222 Removed language="javascript" as deprecated FrancescoUK 2016-06-27 21:04:27 +01:00
  • 7c65484ada Fixed daterangepicker translation FrancescoUK 2016-06-27 16:33:52 +01:00
  • 163732b87f Drop and recreate completely session table with new structure FrancescoUK 2016-06-27 16:15:14 +01:00
  • dd2dc7312c Drop session table's primary key, change introduced with CI3.0.6 to prevents conflicts if sess_match_ip is set to TRUE FrancescoUK 2016-06-27 15:57:20 +01:00
  • 586c8f8db9 Added support for receipt templates, added default and short version (#678) FrancescoUK 2016-06-26 20:06:37 +01:00
  • 0293b6dbd8 Brazilian Portuguese translations updated (#650) FrancescoUK 2016-06-26 18:33:18 +01:00
  • d62af2a007 Limit string length of barcode strings (#692) FrancescoUK 2016-06-26 18:21:05 +01:00
  • 6466a71c0a Removed all the character_limiter affecting tabular views (#692) FrancescoUK 2016-06-26 12:20:35 +01:00
  • d2d9aae9ce Regen dist files FrancescoUK 2016-06-26 12:06:09 +01:00
  • 362b32357f Complete translation support with dropdowns and Store Config pages (#439) FrancescoUK 2016-06-25 19:43:53 +01:00
  • 4b64269905 Fixed regression introduced with button translation support change (#699) FrancescoUK 2016-06-25 16:05:23 +01:00
  • e25ce12e55 Only mount uploads folder as docker volume (#616) Remove base64 jQuery plugin (#684) jekkos 2016-06-25 12:35:51 +02:00
  • b76d4526de Renamed prefix recvs_ to be the extended version receivings_ matching the Controller name (#439) FrancescoUK 2016-06-25 09:39:04 +01:00
  • 1affe3c093 Strip html tags from image upload error message (#696) FrancescoUK 2016-06-25 09:31:18 +01:00
  • 57759d2775 Make bootstrap dialog buttons translatable (#439) Update deploy instructions in Readme (#616) Add partial views to load CI translations in javascript (#439) jekkos 2016-06-25 01:48:43 +02:00
  • 6744ad1891 Brazilian Portuguese translation updates (#650) FrancescoUK 2016-06-24 18:42:28 +01:00
  • d378cfdb5f New look for the Reports listing page, code tidy up, dist regen (#695) FrancescoUK 2016-06-24 17:55:10 +01:00
  • 6d012144db Removed unreferenced code in Sales Controller (#475) FrancescoUK 2016-06-23 23:34:25 +01:00
  • d911447b43 Fixed wrong recvs_invoice_number usage in sales receipt (#694) FrancescoUK 2016-06-23 23:08:43 +01:00
  • 0bd74b9df5 Update README.md for deployment (#616) jekkos 2016-06-23 23:41:47 +02:00
  • 725d447ab3 Add instructions to deploy to docker cloud (#616) Use environment variables in database.php to read settings for contianer jekkos 2016-06-23 23:36:40 +02:00
  • 413fef4c6f Don't lose disabled setting on email config submit (#441) FrancescoUK 2016-06-23 20:43:09 +01:00
  • 6c9c28bd28 Brazilian translation of Receiving Reference addition (#635) FrancescoUK 2016-06-23 19:41:46 +01:00
  • 331d97b48f Added email config to Store Config, added Email_lib, refactored email code (#441, #519) FrancescoUK 2016-06-23 19:26:51 +01:00
  • cf860be1fc Small refactoring of library classes FrancescoUK 2016-06-23 18:12:18 +01:00
  • 2ca3911d56 No autoload and refactoring of SMS lib and Message Controller to be consistent with the rest of libraries (#693) FrancescoUK 2016-06-23 09:05:30 +01:00
  • 67a2912537 Allow Giftcard to do not have customer assigned (#689) FrancescoUK 2016-06-22 22:47:25 +01:00
  • 9119c16c49 Correctly link container files in docroot (#616) jekkos 2016-06-22 08:49:34 +02:00
  • 7e56617044 Add volumes directly in Dockerfile and symlink to docbase (#616) jekkos 2016-06-22 08:38:50 +02:00
  • d72bddbd9d Export data with controller filename (#684) Upgrade table export plugin to newer fork Fix variable substitution in .travis.yml (#616) jekkos 2016-06-21 23:15:49 +02:00
  • de9a4dac08 Fixed failures in updated rows in Suppliers and Report Detailed Receivings (#683) FrancescoUK 2016-06-21 20:32:55 +01:00
  • 9bada9e18e Push to docker hub if username is defined (#616) jekkos 2016-06-21 21:33:25 +02:00
  • b87f50aedf Fix malformed .travis.yml (#616) jekkos 2016-06-21 21:21:30 +02:00
  • 04fdbfb187 Made ospos XSS clean optional and configurable from application/config/config.php (#39) FrancescoUK 2016-06-21 18:31:39 +01:00
  • 9a1def21cc Code tidy up (#635) FrancescoUK 2016-06-21 09:44:24 +01:00
  • 0b423f5828 Add utf-8 compatible base64 dependency (#649) Don't push to docker hub if no login information set (#616) jekkos 2016-06-21 16:21:07 +02:00
  • e4988d806f Made sale invoice email send consistent with receipt (#475) FrancescoUK 2016-06-21 09:10:05 +01:00
  • e9fe27a59e Further fix of email receipt regression (#475) FrancescoUK 2016-06-21 09:07:12 +01:00
  • e56f418696 Fixed email receipt regressions (#475) FrancescoUK 2016-06-21 08:56:29 +01:00
  • bb85a172a2 Change invoice_number in Receiving to be Reference, tidy up code (#635) FrancescoUK 2016-06-21 08:48:36 +01:00
  • 4cf1c31d4f Remove padding for comments field in register (#680) Properly align checkboxes in right lower corner (#680) Add fix for bootstrap-tables delete and regen dist (#627) Tidy up receipt email send code (use empty instead of isset) jekkos 2016-06-21 08:31:11 +02:00
  • 15fd832705 XSS clean Receiving (#39) code refactoring and various issues fixing FrancescoUK 2016-06-20 22:17:55 +01:00
  • 17dcd3fdb2 Tag docker image with branch name after build (#616) Add docker cloud stack config file jekkos 2016-06-20 22:53:06 +02:00
  • 8aa46126c5 Use bootstrap grid for payment options in sale register (#116) Short review of receipt/invoice email send (#475) jekkos 2016-06-20 21:23:34 +02:00
  • 6c791afffc Fixed Item Kits comment typos and small refactoring (#665) FrancescoUK 2016-06-19 21:07:10 +01:00
  • 6c6e41495c Fix item kit barcode generation (#665) jekkos 2016-06-19 19:09:43 +02:00
  • a4488ec090 Further regression fix with item edit and deleted flag (#672) FrancescoUK 2016-06-19 12:58:47 +01:00
  • c75675129b Fixed typo in Barcode 39 exception message FrancescoUK 2016-06-19 12:47:20 +01:00
  • ac968e21e6 Additional tidy up (#667) FrancescoUK 2016-06-19 12:35:52 +01:00
  • ad1b3aeaac Allowed search box and filters to be contextual to selected date range (#667) FrancescoUK 2016-06-19 11:57:53 +01:00
  • 8c5decee34 Fix regression introduced with #664 around deleted items (#672) FrancescoUK 2016-06-19 11:11:16 +01:00
  • bbbf24c2a5 Don't allow adding deleted Items by item_id in Sales register and Receiving (#664) FrancescoUK 2016-06-18 12:52:58 +01:00
  • 936c74211f Small refactoring of Sales form (#639) FrancescoUK 2016-06-18 11:46:45 +01:00
  • fdb5e3406e Fix syntax erorr in is_valid_receipt (#655) jekkos 2016-06-17 07:45:03 +02:00
  • 359184934e Fix refresh after deleting all items on last page (#627) jekkos 2016-06-16 23:10:54 +02:00
  • 776c819509 Tag docker image and push to docker hub (#616) jekkos 2016-06-16 22:11:24 +02:00
  • 1c4f6f4fb3 Update daterangepicker in bower no dist regen FrancescoUK 2016-06-16 19:13:10 +01:00
  • 28d3a3dce3 Fixed error with barcode auto generate (#640) FrancescoUK 2016-06-16 19:11:31 +01:00
  • fb4dc5af84 Remove curl call to wait for container (#616) jekkos 2016-06-16 20:04:29 +02:00
  • 26358620eb Fixed bug with barcode auto generation (#640) FrancescoUK 2016-06-16 17:54:12 +01:00
  • 105eca20b2 Update portugese (brazilian) translations (#650) jekkos 2016-06-16 17:49:45 +02:00
  • 9e675e81ec Perform regex check in is_valid_receipt (#655) jekkos 2016-06-16 17:40:26 +02:00
  • 86b22e7987 Make travis build regular dockerFile directly (#616) jekkos 2016-06-15 20:42:29 +02:00
  • c39e0a2ed4 Copy curl into test container (#616) jekkos 2016-06-15 18:42:49 +02:00
  • 1cadd2b06b Run docker-compose up in background (#616) jekkos 2016-06-15 17:57:04 +02:00
  • 6b5d61414c Enable item kit return (#655) Don't install curl in test container (#616) jekkos 2016-06-15 17:34:39 +02:00
  • 3890eaf162 Show general config error messages in the correct place (#655) jekkos 2016-06-15 08:54:22 +02:00
  • 4b0badfb30 Fix customer search in takings (#654) Replace payment type label with amount tendered (#513) jekkos 2016-06-15 08:44:24 +02:00
  • 1861f4f71f Don't take totals row in takings into account for pagination (#620) Reset payment summary css position underneath table jekkos 2016-06-14 18:45:25 +02:00
  • 3129319efe Try to start test container as travis-ci test (#616) jekkos 2016-06-15 14:24:01 +02:00
  • 1392055d44 Adapt default test container command (#616) jekkos 2016-06-15 14:22:24 +02:00
  • 4119d8d5a8 Build image using docker-compose (#616) jekkos 2016-06-14 12:50:34 +02:00
  • 5d494fa08e Fix bstables pagination when deleting all items in last page (#627) jekkos 2016-06-14 08:35:14 +02:00
  • 3a5b88d51c Added configuration order of payment options available in Sales Register (#456 #646) FrancescoUK 2016-06-13 19:39:02 +01:00
  • 11ad1c2476 Regen dist files FrancescoUK 2016-06-13 18:58:17 +01:00
  • 17443a3d4f Fixed ugly invoice issue (#442) and added company name in invoices always FrancescoUK 2016-06-13 18:33:40 +01:00
  • 9dc7405eaa How to remove index.php from URL (#645) + set a config rule to be strict with sessions matching IP FrancescoUK 2016-06-13 17:54:31 +01:00
  • cd6277c1a8 Removed use_invoice_template as it's not used anymore (#639) FrancescoUK 2016-06-13 09:15:43 +01:00
  • 73dc5a9f70 Merge branch 'sonnysk76-master' FrancescoUK 2016-06-12 18:55:31 +01:00