mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-28 11:11:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,079 Commits 37 Branches 39 Tags
c124c08f89485704f73eeeb5d9f4dcff7eb98568
Commit Graph

302 Commits

Author SHA1 Message Date
FrancescoUK
d2565009d8 fix wrong behaviour with due amount and Complete button on "sale" <=0 and "return" >=0 (#116) 2016-03-12 09:23:54 +00:00
FrancescoUK
f32bba31b5 fix sales/register return, make complete replacing add payment button on 0 amount due, remove pop up on complete and suspend (#116) 2016-03-11 21:55:31 +00:00
FrancescoUK
69c1af586e relayout of sales/register right panel to follow a more logical flow (#116) 2016-03-11 17:23:32 +00:00
FrancescoUK
2df8645c5f code comments, various bits and bobs (#116) 2016-03-11 17:20:07 +00:00
jekkos
f6b9ef16d0 Add default jquery ui theme instead of smoothness theme (#328) 
Remove obsolete ajax queue plugin (#328)
Add image preview widget for avatar upload in items form (#372)
 2016-03-11 18:07:41 +01:00
jekkos
399cc38eb9 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 2016-03-10 21:29:04 +01:00
jekkos
652702f582 Fix delete button + image upload widget refresh for company logo (#372) 2016-03-10 21:28:37 +01:00
FrancescoUK
05a1dd561c sales/register alignments, added customer info (#116, #369) 2016-03-10 19:21:54 +00:00
FrancescoUK
71a8dce949 regenerate dist files (but issue with search dropdown style) (#328) 2016-03-09 17:10:47 +00:00
FrancescoUK
ceac184c30 add comment about barcodes (#116) 2016-03-09 14:00:27 +00:00
FrancescoUK
f9803cb4f5 move barcode_sheet.php to views/barcode dir (#116) 2016-03-09 13:41:30 +00:00
FrancescoUK
626667b3fd Merge branch 'master' into bootstrapUI 2016-03-08 22:42:03 +00:00
FrancescoUK
bf2c6bfa1f fix issue with sale edit 2016-03-08 21:53:29 +00:00
FrancescoUK
76639f6da1 remove misleading comment from code 2016-03-08 19:50:46 +00:00
FrancescoUK
d7df291b9a Merge branch develop/2.4 into master 2016-03-08 19:14:36 +00:00
jekkos
741843586d Remove duplicated cookie cleanup hack (CI 2.x issue) 2016-03-08 18:18:27 +00:00
FrancescoUK
fafdfd9afd fix php error on suggestion typing when in sale register return mode (#331) 2016-03-08 18:18:27 +00:00
FrancescoUK
a156ad8087 Fix issue in Sales/Takings and apply same fix to other controller to avoid similar issues in the future (#337) 2016-03-08 18:16:31 +00:00
FrancescoUK
b36a03c4bc Fix to sales edit server error when customer is '' (#337) 2016-03-08 18:16:31 +00:00
jekkos
5f8eface28 Properly save company_name in customer form 2016-03-08 18:16:31 +00:00
FrancescoUK
df4cea3228 Fix to custom fields that cannot be null on Items save (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
9dcbef988a Added comments to some controller functions and improved spacing to improve readibility of code (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
d1a973564f Make NULL to be null all over the code for consistency purposes (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
da52ff99c1 Further review and fixes to input->post(...) (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
ee07676193 Fix to items search not working due to input->post returning null (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
9a71bbc620 Complete CI 3.0.3 upgrade since it wasn't done in full (#120) 2016-03-08 17:44:59 +00:00
FrancescoUK
36d3717bd6 EXT constant deprecated, upgrade Step 20 (#120) 2016-03-08 17:44:59 +00:00
Toni Haryanto
75fa1a8167 Upgrade to Code Igniter 3.0.3 (#120) 2016-03-08 17:41:16 +00:00
FrancescoUK
ea394a00b5 remove spinner, unused images, unused code (#116 #328) 2016-03-08 12:42:38 +00:00
jekkos
2436cf5da5 Fix suggestions for item kits (by name and KIT id) (#328) 2016-03-08 08:39:21 +01:00
jekkos
dfbab194de Add item search for category + suppliers (#328) 2016-03-07 23:21:57 +01:00
jekkos
fe2787217f Fix item suggestion in item kits, fix category suggestion in item form 
(#328)
 2016-03-07 22:42:42 +01:00
jekkos
554f2b32db Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI 
Conflicts:
	application/views/items/manage.php
	application/views/partial/header.php
	dist/opensourcepos.min.css
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php
 2016-03-07 21:33:26 +01:00
jekkos
36f825d0fe Replace legeacy autocomplete with jquery-ui version (#328) 
Cleanup PHP search suggestion functionality
Add jquery-ui css explicitly (wasn't included in bower main attribute)
 2016-03-07 21:23:29 +01:00
jekkos
6c29faeba1 Remove old jquery autocomplete 
Remove id|name format in giftcards customer selection
Cleanup duplicated custom field suggestion in Items
Migrate table search suggestion to jQuery UI
Add jquery UI bootstrap theme
 2016-03-07 07:56:41 +01:00
FrancescoUK
7f37ebf87e proper support of date range in reports input leveraging all the features, translations and fixed some bugs (#116) 2016-03-06 21:34:12 +00:00
FrancescoUK
a04101d756 fix an issue with error messages on required fields in Items/form (#116) 2016-03-05 11:33:25 +00:00
FrancescoUK
1d9a7eced3 set correct order new & submit buttons in receiving (#116) 2016-03-04 22:42:28 +00:00
FrancescoUK
6d547048c4 set two methods private in Items and Config controllers (#116) 2016-03-04 21:44:00 +00:00
jekkos
a201d18938 Add specific warning when stock goes below reorder level in sales (#365, #336) 2016-03-02 08:28:50 +01:00
FrancescoUK
0cd7af7c4f change file load widget in excel_import forms (#116) 
used jasny-bootstrap
 2016-02-28 16:26:58 +00:00
jekkos
af5d39a394 Set delete button color in sales / receivings edit form (#116) 
Fix password field layout in employee edit mode
 2016-02-28 01:02:27 +01:00
FrancescoUK
0dce125f67 fix controls sizes in all the forms, fix datetimepicker in sales/form and receiving/form, fix item_kits/form (#116) 2016-02-27 21:55:52 +00:00
jekkos
4a68ab13e1 Bootstrapify sales and receivings forms (#116) 2016-02-27 20:01:00 +01:00
FrancescoUK
d7ff9bed1a Merge branch 'ci3' into bootstrapUI 2016-02-27 09:44:41 +00:00
jekkos
a9902219ae Continue bootstrapification (item bulk edit, bootstrap modals) 
(#116, #361)
Remove get_form_width() from controllers, add new class to define modal width
Add bootstrap validation markup to edit forms
 2016-02-25 23:31:43 +01:00
jekkos
3cb9aaa055 Remove duplicated cookie cleanup hack (CI 2.x issue) 2016-02-25 23:28:19 +01:00
FrancescoUK
831dc7a0b8 fix php error on suggestion typing when in sale register return mode (#331) 2016-02-25 15:44:13 +00:00
jekkos
deb4a501d6 Finish config module restyle (#116) 2016-02-22 23:44:52 +01:00
FrancescoUK
03146d9e3b Fix issue in Sales/Takings and apply same fix to other controller to avoid similar issues in the future (#337) 2016-02-22 17:52:29 +00:00