mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-08 10:32:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
717 Commits 59 Branches 40 Tags
5468127e2f5404c4c770943da3abfdd4febeea99
Commit Graph
717 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
FrancescoUK 5468127e2f Further review and fixes to input->post(...) (#120) 2016-01-16 22:04:12 +00:00
FrancescoUK d66e6ab6ef Fix to items search not working due to input->post returning null (#120) 2016-01-15 22:53:09 +00:00
FrancescoUK a3929d2c6f Merge remote-tracking branch 'jekkos/master' into ci3 
# Conflicts:
#	application/config/database.php.tmpl
 2016-01-15 18:57:11 +00:00
jekkos b5cc1542b6 Merge branch 'master' of https://github.com/jekkos/opensourcepos 2016-01-13 18:58:40 +01:00
jekkos 1a77960daa Update README.md with instructions for Docker setup 2016-01-13 18:57:44 +01:00
jekkos 301fbf4427 Merge pull request #283 from ais-one/ais-one-php7-fix 
php7 fixes
 2016-01-13 17:59:01 +01:00
Aaron Gong 2f0666325f PHP7 Fix 
Use __construct as constructor instead of Class name
 2016-01-13 15:59:37 +08:00
Aaron Gong d0c765ce20 PHP7 fix 
Change driver from mysql to mysqli
 2016-01-13 15:58:20 +08:00
jekkos a1ad99cc0d Add Dockerfile. Ospos is now containerized. Pull image from 
docker build -t me/ospos git://github.com/jekkos/opensourcepos.git

then run

    docker run -it me/opensourcepos

And head to port 80 to login to a new ospos install.
 2016-01-13 08:45:10 +01:00
jekkos 2d0b20499e Set correct locale for Dutch (Belgium) 2016-01-11 18:53:57 +01:00
FrancescoUK 5b01e60ed2 Merge branch 'master' #274 change into ci3 2016-01-10 13:13:55 +00:00
jekkos 26ff81ab71 Generate languages for German (Swiss) #274 2016-01-09 17:29:57 +01:00
Thorsten da3349765a Add de_CH language (by nano-riff #274) 2016-01-09 16:46:00 +01:00
FrancescoUK b470fbfb3d Fix merge miss in constants.php (#120) 2016-01-07 20:57:57 +00:00
FrancescoUK 1f86842757 Complete CI 3.0.3 upgrade since it wasn't done in full (#120) 2016-01-07 20:16:59 +00:00
FrancescoUK de47b11880 Remove application/errors, upgrade Step 8 (#120) 2016-01-07 19:09:53 +00:00
FrancescoUK 6b2b3969ec EXT constant deprecated, upgrade Step 20 (#120) 2016-01-07 19:09:53 +00:00
FrancescoUK 14c5a0823b Follow upgrade guideline Step 9 (#120) 2016-01-07 19:09:53 +00:00
FrancescoUK 98b5c8da28 Fix reports error due to report.php now being Report.php (#120) 2016-01-07 19:09:53 +00:00
FrancescoUK cd7060afed Change config language to be 'en' consistent with the OSPOS language identifiers (#120) 
However language support doesn't work properly at the moment.
 2016-01-07 19:09:53 +00:00
FrancescoUK 0787264f71 Improve .htaccess with some security rules (#120) 2016-01-07 19:09:53 +00:00
FrancescoUK 347609d20c Upgrade config.php and database.php.tmpl to CI 3.0.3 versions (#120) 
Apparently the upgrade wasn't complete.
 2016-01-07 19:09:53 +00:00
FrancescoUK 0340dc7ffc Remove application/config.php and database.php (#120) 2016-01-07 19:06:35 +00:00
Toni Haryanto d8057830c6 Upgrade to Code Igniter 3.0.3 (#120) 2016-01-07 19:06:35 +00:00
jekkos 4ddde65b41 Bump version to 2.3.4 
Update dutch translation for company_name
Fix timeformat for date filtering in items module
 2016-01-07 19:53:52 +01:00
jekkos c408afad67 Cleanup migration script, mostly working now (#262) 2.3.3 2016-01-05 17:41:43 +01:00
jekkos b1ba7d0afe Split up database.sql in scripts for tables and contraints. 
Use both new scripts in phppos_migrate.sql
 2016-01-05 07:41:49 +01:00
FrancescoUK 31a223cece Merge pull request #272 from daN4cat/master 
#271 fix to error witn xampp due to a spurious "git"
 2016-01-04 22:13:29 +00:00
FrancescoUK 3bd778737f #271 fix to error witn xampp due to a spurious "git" 2016-01-04 22:09:38 +00:00
jekkos 648251978e Merge pull request #270 from daN4cat/master 
Fixes to #265, #267 and #269
 2016-01-04 22:13:25 +01:00
FrancescoUK 240c96a185 #267 remove warning due to junk dirs being inside a language/xx one 2016-01-04 19:44:15 +00:00
FrancescoUK 810000e37c #265 do not override 404 handler in routes.php 2016-01-04 18:23:16 +00:00
FrancescoUK 6aa5126bf0 #269 fix https error issue 2016-01-04 17:55:00 +00:00
jekkos 90591382ce Further cleanup phppos migration script (#262) 2016-01-04 17:26:42 +01:00
jekkos 9e2d89c528 Show discounted price instead of discount itself on receipt 2016-01-04 17:19:50 +01:00
jekkos 1601d679fd Takings not using proper permission (#262) 2016-01-04 17:04:33 +01:00
jekkos aa0409af48 Add phppos migration script (untested) #258 2016-01-01 17:10:43 +01:00
jekkos ad194bd4c0 Fix typo in english translation (#260) 2016-01-01 16:46:58 +01:00
jekkos 1779685d31 Encode text before storing it as session variable (#254) 2015-12-30 08:10:14 +01:00
jekkos 51df82f35e Update WHATS_NEW 2015-12-30 07:42:27 +01:00
jekkos bf0622d7fa Show discounted price per item line 2015-12-26 15:26:32 +01:00
jekkos da25281df9 Show discounted price per item line 2015-12-26 15:21:54 +01:00
jekkos 2f52d083e8 Update changelog for 2.3.3 2015-12-26 13:13:47 +01:00
jekkos eb63f49db7 Add barcode generation for EAN8 and EAN13 (#111, #246) 
Add config option to use generation when generating barcodes for an
Generate propery barcode with configured format if item_number empty
 2015-12-26 11:42:58 +01:00
jekkos c007513fc8 Fix barcode generation error for empty item numbers 2015-12-13 15:57:03 +01:00
jekkos 9f5782e0ba Add validation for barcode types (#111, #246) 
Fallback to code128 if invalid EAN8 or EAN13 is detected
 2015-12-13 15:51:25 +01:00
jekkos 2f14a0f868 Fix typo in store language line (#247) 2015-12-13 14:15:43 +01:00
jekkos fb924daa81 Show reoder level in items form when editing (#241) 2015-12-04 18:13:05 +01:00
jekkos 1bb9acdc37 Fix for adding/deleting stock locations (#242) 2015-12-04 18:09:51 +01:00
jekkos 16d5dfce77 Merge pull request #244 from kamaroly/master 
Fixed Severity: Notice Message: Only variable references should be returned by reference Filename: core/Common.php Line Number: 257
 2015-12-03 23:06:22 +01:00