mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-03 06:57:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,319 Commits 35 Branches 40 Tags
e89bd73bb5d7c8cb084284c30ddc3e84fd1f16bb
Commit Graph

81 Commits

Author SHA1 Message Date
FrancescoUK
e89bd73bb5 Add reCaptcha to login page (#1443) 2017-08-05 11:46:48 +01:00
FrancescoUK
cd792eb56a Add receipt font size configuration (#1401 #1416) 2017-07-28 21:48:34 +01:00
Steve Ireland
eccf08cf8f Improve tax category maintenance. 2017-07-15 16:42:27 -04:00
jekkos
a92d60d99f Minor refactoring tax story 2017-07-14 00:07:13 +02:00
FrancescoUK
47486b980f Fix Store Config Tax category, Reward, Locations and Tables add and remove of entries 2017-07-13 22:43:49 +01:00
FrancescoUK
b0e3600ea6 Fix stock location update (#1389) 2017-07-12 22:22:05 +01:00
FrancescoUK
60db2cc4b0 Fixes 2017-07-11 22:43:08 +01:00
Steve Ireland
b7951ea5b2 Consolidate tax configuration. 2017-07-11 22:36:32 +01:00
FrancescoUK
f92b06cff2 Fixes 2017-07-11 22:23:14 +01:00
Steve Ireland
bab4791b5e Consolidate tax configuration. 2017-07-09 18:48:47 -04:00
FrancescoUK
a78f053c80 Fix config Table and Reward errors 2017-07-02 19:48:58 +01:00
FrancescoUK
c8499599ab General code tidy up, added documentation 2017-07-02 11:15:57 +01:00
FrancescoUK
94ea15bc18 Fixed notification pop up issues in Config with tables & rewards 2017-06-04 14:31:50 +01:00
FrancescoUK
91fd435cca Fixes to reports tax summary and rewards regressions 2017-06-04 10:46:24 +01:00
FrancescoUK
daa1614615 Revert "Merge pull request #1281 from RuleDomain/migrate-sales-tax-history" 
This reverts commit 11e1cc51aa, reversing
changes made to b32c23ce10.

# Conflicts:
#	application/models/Sale.php
 2017-05-01 11:50:13 +01:00
Steve Ireland
c710ec938f Sales tax history migration 2017-04-30 11:30:39 -04:00
FrancescoUK
c68fa19584 Made print company name in receipts optional (#925) 2017-04-22 17:09:22 +01:00
FrancescoUK
5bdf6d396b Add Mailchimp connector (#113) avoid email duplicates (#112) 2017-04-22 16:07:33 +01:00
Joshua Fernandes
621a74653d requested changes 2017-04-22 13:33:45 +01:00
jekkos
b057d1c3c0 Overload existing env vars with .env contents (#974) 
Add error handling if .env is not present
 2017-04-20 08:27:04 +02:00
FrancescoUK
9d01398a4b Minor code style adjustments 2017-04-17 21:47:22 +01:00
FrancescoUK
938907fe20 Added financial year start date (#1141), various fixes on date & time 2017-04-17 20:20:53 +01:00
Steve Ireland
effba9d102 Add support for customer sales tax and cash rounding 2017-04-14 21:21:44 -04:00
Joshua Fernandes
deea43ce67 customer reward points first phase work 2017-03-04 16:13:56 +05:30
Jorge Colmenarez
6826115b2d Support for Configurable Dinner Tables Feature 2017-02-26 15:35:21 -04:00
Steve Ireland
9bf8989960 This will add support for preparing quotes and generating invoices prior 
to payments
 2017-02-19 13:37:32 -05:00
FrancescoUK
ae4ff80974 Fix encryption key generation issue (#1110) 2017-02-07 20:49:19 +00:00
FrancescoUK
4ca862ba9f Refactor code (#1110) 2017-02-05 21:24:29 +00:00
FrancescoUK
df9b776d56 Add support for MySQL 5.7 (#630) and PHP7 (#591), better Item Kits (#625) 2017-01-30 20:10:17 +00:00
Steve Ireland
f9c1dde054 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 2017-01-29 22:23:46 -05:00
root
305d9dd55e Support for Date or Time Format 2016-11-30 14:32:25 -04:00
FrancescoUK
868868163c Replace Appconfig->get with config->item to reduce database calls 2016-11-08 20:09:40 +00:00
FrancescoUK
1f2e87ec09 Encrypt email and sms passwords before saving to MySQL (#963) 
It also automatically generates an encryption key if not existing storing it in config/config.php in order to enable encryption.
 2016-11-07 19:20:44 +00:00
FrancescoUK
3543321309 Rename LICENSES to be bower.LICENSES (#624) 2016-10-02 16:25:51 +01:00
FrancescoUK
b1409f432b Refactor COPYING/LICENSE file in composer setup (#624) 2016-10-02 16:14:33 +01:00
FrancescoUK
9c025c6feb Made send statistics configurable 2016-09-24 21:13:13 +01:00
FrancescoUK
b6bda3c3ed Print Composer Libraries License in Store Config (#624) 2016-09-11 20:53:51 +01:00
jekkos
e302086b13 Merge branch 'master' into feature/composer 
Conflicts:
	.travis.yml
	application/controllers/Login.php
	application/views/partial/header.php
	public/dist/opensourcepos.min.js
 2016-08-19 12:09:38 +02:00
FrancescoUK
45675b8f29 Copy COPYING file to license dir, update js plugin, regen dist files 2016-08-18 20:17:54 +01:00
jekkos
2c1231ca61 Install CI langauges in system/language as before (#624) 
Map CI language folder with ospos language code
 2016-08-18 13:33:02 +02:00
FrancescoUK
b77d368885 Refactoring and statistics support 2016-08-12 21:23:26 +01:00
jekkos
059ec54c72 Make theme configurable from config module (#409) 
Add symlink to bower_components in Docker dev environment (#616)
Move header_debug content back into header view
 2016-08-10 18:58:17 +02:00
FrancescoUK
597a5caee5 XSS clean the license text (#359) 2016-08-08 16:09:40 +01:00
FrancescoUK
19403adde2 Read plugin LICENSES json and display in Store Config (#359) 2016-08-08 15:54:29 +01:00
FrancescoUK
fba0915c42 Fixed DB backup error due to & (#629) 2016-08-01 08:24:16 +01:00
jekkos
75db191baf Fix notification popup for fresh installs 
Fix docker setup by compiling php5-intl (#616)
 2016-07-17 12:52:38 +02:00
jekkos
1af612d18e Add thousands separator option (#458) 
Fix adding payment with comma as decimal separator (#740)
 2016-07-15 11:22:31 +02:00
FrancescoUK
a0e894895e Fix typos (#359) 2016-07-10 17:38:53 +01:00
FrancescoUK
09a3499069 Added license statement displaying, updated COPYING and other license files (#359) 2016-07-10 15:50:25 +01:00
jekkos
21f5e46488 Fix tax percentage parsing (#458, #727) 
Add tabindexes to price, discount field in register
 2016-07-08 08:47:03 +02:00