mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-05 14:24:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,123 Commits 91 Branches 39 Tags
28d89c685bc5aedabb71b993fa329b506960f044
Commit Graph

64 Commits

Author SHA1 Message Date
Steve Ireland
faadbe554a Change kit item selection from the Item Kit maintenance to only select kit items. 2017-02-01 14:43:16 -05:00
Steve Ireland
68cf3bf68b Merge remote-tracking branch 'jekkos/item-kit' into item-kit 2017-01-29 23:10:37 -05: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
Steve Ireland
dd6bd1cf11 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 2017-01-21 23:26:01 -05:00
FrancescoUK
7682f02222 Removed language="javascript" as deprecated 2016-06-27 21:04:27 +01:00
jekkos
57759d2775 Make bootstrap dialog buttons translatable (#439) 
Update deploy instructions in Readme (#616)
Add partial views to load CI translations in javascript (#439)
 2016-06-25 01:54:54 +02:00
FrancescoUK
b11377041d XSS clean Customers, Employees, Suppliers, Person, Item_kits. Minor fix Giftcards and Config (#39) 2016-06-04 15:05:02 +01:00
jekkos
d2f3497d1e Fix item avatar rollover when hovering (#596) 
Fix invoice right border (add colspan) (#529)
Fix form erorr handling (inherit in right order)
 2016-06-01 08:39:03 +02:00
jekkos
349000bd8a Fix sale and receiving edit and delete in detailed report (#507, #293) 2016-05-11 17:57:37 +02:00
jekkos
c3f2f41888 Fix barcode generation in items and item_kits (#537, #538) 
Enable sorting in takings (with static row below the table) (#293, #507)
 2016-05-09 18:40:13 +02:00
FrancescoUK
f7ea83091c Fixed mistype var causing a delete confirm box to be empty in item kits (#507) 2016-05-06 19:49:09 +01:00
FrancescoUK
9eb21137f6 Fixed glyphicon button space and completed sales & register glyphicons (#507) 2016-05-05 16:44:09 +01:00
jekkos
408774b14c Apply ospos lines per page setting to bootstrap-table pagination (#507) 2016-05-03 18:16:50 +02:00
jekkos
e7a22e4e41 Enable bootstrap tables localisation and integrate with ospos scripts 
(#293)
Fix item bulk update (all items are updated now) (#507)
Stop click event propagation when opening modal dialog on a table row
(caused row to be selected/deselected)
 2016-05-03 08:10:37 +02:00
jekkos
d5d96fa777 Add receipt button in takings (#507) 
Fix add stock location in store config
Fix stock location filtering in items module
Fix item kits barcode generation
Fix broken form after first submit in all modules
Remove temp js from dist/ (#293)
 2016-05-03 08:10:37 +02:00
jekkos
c9142ca69b Fix payment summary in sales (#293) 
Add glyphicons to buttons in register + receiving views
Refactor table_support init function
Various bugfixes
 2016-05-03 08:10:36 +02:00
jekkos
2dab5e0fe7 Bootstrap-tables integration for sales module (WIP) (#293) 
Refactor manage_tables, remove public function identifiers
 2016-05-03 08:10:36 +02:00
jekkos
8cf32f4470 Fix item kits view + search, item bulk edit (#293) 
Refactored table_helper to add first and last column automatically
 2016-05-03 08:10:36 +02:00
jekkos
48c49ddb74 Fix item kits glyphicons + new button tooltip (#293) 2016-05-03 08:10:36 +02:00
jekkos
46ad34548f Enable bootstrap-tables for item kits module (#293) 2016-05-03 08:10:35 +02:00
FrancescoUK
bb0989f6bd Adjust form fields size to give more space and fit better dialog form, fixed few details 2016-04-18 18:31:40 +01:00
FrancescoUK
c77fa6e5c4 Fixed various issues preventing all languages to work fine in all views (#470) 2016-04-09 23:37:34 +01:00
FrancescoUK
d83c8051f6 Rename forms to have form_ prefix, move form styles to popupbox.css 2016-04-07 20:30:42 +01:00
FrancescoUK
afcb1641b7 Added decimals to taxes (#327), added totals rounding matching decimals (#327 #307, #429) 2016-04-02 13:59:01 +01:00
FrancescoUK
6efdccfef0 add configurable quantity decimals (#429) 2016-04-01 00:07:05 +01:00
FrancescoUK
affefb44b4 Resize Item_kits and Items forms quantity fields to space for 3 decimals (#429) 2016-03-31 20:12:56 +01:00
FrancescoUK
b2597df44c replaced float_left with pull-left and float_right with pull-right (#116 #293) 2016-03-31 17:35:42 +01:00
FrancescoUK
c8f6f6adf0 remove code submitted accidentally (#116 #293) 2016-03-31 17:08:34 +01:00
FrancescoUK
83edcaf955 set the filters in Items and Sales/Takings on the right side (#116 #293) 2016-03-31 16:33:30 +01:00
FrancescoUK
7f44d379f5 removed redundant page titles, moved pagination up, adjusted styles, regen dist (#116) 2016-03-26 22:56:51 +00:00
FrancescoUK
d4dae9fd32 bootstrapify pagination links, remove old styling, don't print links in takings, change <?= to be <?php (#116, #394) 2016-03-15 19:08:14 +00:00
FrancescoUK
eb838cdb9f Change table links to be glyphicons, fix tooltips sentence in sales/manage, fix sortable columns (#116) 2016-03-14 18:40:07 +00:00
FrancescoUK
1f56a8da8c fix feature/bootstrapUI Reports issue with today date selection (#395) 2016-03-13 12:38:52 +00:00
FrancescoUK
4a216f0a7c used proper form and group-form for table action search and header (#116) 2016-03-08 12:28:18 +00: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
FrancescoUK
04b6ba21f7 bootstrapisation of #table_action_header in all views, tidy up css styles changed px to em (#116) 2016-03-07 19:09:57 +00: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
f9971aabb6 remove unnecessary .':' from form labels (#116) 2016-03-04 21:57:58 +00:00
jekkos
2833b7598e Bootstrapify date_input for reports (#116). Form alignment to be 
improved, basic version working
Move common jquery validation settings to base object
 2016-02-29 22:21:36 +01:00
jekkos
68c4c1cc56 Use bootstrap style to highlight fields in error state after failed validation (#116) 2016-02-29 08:14:00 +01:00
jekkos
bc8673d883 Remove debugger statement + fix glyph in item kits form (#116) 2016-02-28 23:52:04 +01:00
FrancescoUK
6b76e28ebb fix tables in item_kit/form items/inventory details and sales/suspended (#116) 2016-02-28 21:24:55 +00:00
FrancescoUK
92bfd903dc bootstrapify inventory details form, fixed multilocation support that was broken (#116) 2016-02-28 19:08:05 +00:00
FrancescoUK
d96fafa92f remove redundant title strings from all the forms (#116) 
The dialog box has already a title and there is no need to double the subject.
 2016-02-28 14:21:05 +00:00
FrancescoUK
c0a048251e fix silly 1px drop with glyphicons in front of input, various beautifications: more icons and better tables in suspended and item_kits (#116) 2016-02-28 11:55:11 +00:00
jekkos
99c92e68a6 Add glyphicon to form fields in customer and item (#116) 2016-02-28 01:18:40 +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
7769334372 Add close button by default (#116, #361) 2016-02-26 19:08:49 +01: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