mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-15 23:07:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,307 Commits 49 Branches 39 Tags
ac765e4667ead3ffa585c1bbf104020c1923c8f0
Commit Graph
132 Commits
Author SHA1 Message Date
jekkos eca4b4ffb8 Use bootstrap tables for detailed and summary reports (#293, #507) 2016-05-06 00:37:46 +02:00
jekkos 408774b14c Apply ospos lines per page setting to bootstrap-table pagination (#507) 2016-05-03 18:16:50 +02:00
jekkos c2f895c1d4 Rebase with latest master (#293, #472) 
Enable email button in customers, suppliers only if selected row has
email filled in
Disable sale/receiving edit in reports (TBC)
 2016-05-03 08:58:11 +02:00
jekkos b37f984eb6 Fixes for item kits (new, update) (#507) 
Fixes for takings overview (pagination, sorting) (#293)
Fixes for item tax bulk update (#507)
Table rows are highlighted again before delete (#507)
 2016-05-03 08:10:38 +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 9caed90aee Fix bootstrap tables toolbar icon size (#507) 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 7e088348e0 Regenerate language file + js after rebase, fix various merge bugs 
(#293)
 2016-05-03 08:10:37 +02:00
jekkos 4c55da7229 Enbable inventory, count_details in items (#293) 2016-05-03 08:10:36 +02:00
jekkos 2b03d3bfd7 Continue bootstrap-tables integration (#293) 
Refactor manage_tables code and use proper js namespacing
Add glyphicons for most buttons in customers sections
Tidy up HTML in customers table page
Remove jquery-color plugin (not needed anymore)
Fix some minor css issues (feedback bar bottom margin)
 2016-05-03 08:07:48 +02:00
FrancescoUK 0dca4b8906 small tidy up (#391) 2016-04-26 19:55:09 +01:00
FrancescoUK fa084ec8d2 revert a change affecting order or js when running grunt 2016-04-13 18:34:06 +01:00
FrancescoUK 11e3cd63e0 Move temp file in a tmp dir when generating dist files, tidy up Gruntfile.js 2016-04-12 22:26:57 +01:00
FrancescoUK cf4fd0601f Fixed issue with missing opensourcepos_bower.css in header.php (#469) 2016-04-09 17:14:46 +01:00
FrancescoUK 1d3bcfc2ef Update jQuery to 1.12.3 and smalot-bootstrap-datetimepicker to 2.3.10 2016-04-08 23:24:41 +01:00
FrancescoUK d83c8051f6 Rename forms to have form_ prefix, move form styles to popupbox.css 2016-04-07 20:30:42 +01:00
jekkos 2f07036940 Fix customer selection in sale form (#455) 
Fix invoice layout (restore header width)
 2016-04-06 20:22:19 +02:00
FrancescoUK c981bc7daa update tablesorter to 2.25.7, regenerate dist files even to fix database.sql 2016-04-03 19:33:09 +01:00
FrancescoUK da5c821de3 tidy up of old styles, make login to use standard bootstrap, regen dist (#116) 2016-03-31 18:25:17 +01:00
FrancescoUK 2359af5fbb tune dropdowns style and font size (#116 #293) 2016-03-31 15:20:30 +01:00
jekkos e3ddea07b9 Remove F-key shortcuts for modules (#425) 
Conflicts:

	application/views/partial/header.php
	dist/opensourcepos.min.js
 2016-03-31 08:13:13 +02:00
FrancescoUK 22e38b6f2a bootstrapified and completed rework of the filters section in Sales/Takings (#116 #293) 2016-03-30 22:13:17 +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 2322682014 update bootstrap-dialog, remove jqmigrate, regen dist files (#328) 2016-03-25 21:40:09 +00:00
jekkos fbd7465b03 Remove sync ajax calls in validation callback for forms (#413) 
Remove jquery-bgiframe (not used anynmore) (#328)
 2016-03-21 21:27:46 +01:00
FrancescoUK 3a4e9d9107 remove JQmigrate, update plugins, regen dist files, manual fix of template header (#328) 2016-03-20 22:21:48 +00:00
jekkos a04b1d5803 Fix jQuery deprecation warning in invoice load (#328) 
Ignore giftcard test as it makes build unstable
 2016-03-16 08:13:08 +01: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
jekkos 126f2254f6 Make invoice header responsive, remove fixed height and make font size 
relative. (#116)
 2016-03-15 17:49:10 +01:00
jekkos 64c7eb28b3 Put back form submit buttons (#328) 
Add custom style for jquery autocomplete widgets (#116)
 2016-03-14 23:11:25 +01:00
FrancescoUK 983dad87af regenerate dist file (#394) 2016-03-14 17:21:50 +00:00
jekkos e8e89f1c7e Add workaround for jQuery load deprecation (#328) 2016-03-14 08:49:52 +01:00
FrancescoUK f6be7cdf23 Merge branch 'master' into bootstrapUI 2016-03-13 16:19:44 +00:00
FrancescoUK c124c08f89 readded bootstrap-select and adjusted styling of dropboxes (#116) 2016-03-12 10:57:24 +00:00
FrancescoUK 4433edc552 regenerate dist files (#116) 2016-03-11 17:49:05 +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
FrancescoUK 4913ffe114 regenerate dist files (but issue with search dropdown style) (#116) 2016-03-10 20:16:05 +00:00
FrancescoUK 05a1dd561c sales/register alignments, added customer info (#116, #369) 2016-03-10 19:21:54 +00:00
FrancescoUK 940a899231 more adjustments to sales/register bootstrapisation (#116) 2016-03-10 19:21:54 +00:00
jekkos e175a96acb Fix nominatim address lookup with jquery ui autcomplete (#328) 
Add dblclick event handler to item + customer autocomplete in register
 2016-03-09 20:03:05 +01:00
FrancescoUK 71a8dce949 regenerate dist files (but issue with search dropdown style) (#328) 2016-03-09 17:10:47 +00:00
FrancescoUK e182c9d9f6 regenerate dist files 2016-03-08 21:23:05 +00:00
jekkos 01f59cc247 Fix jQuery migrate warnings in manage_tables (#328) 2016-03-08 20:46:30 +01:00
jekkos 6f6f4354fd Remove jQuery calls for attr (deprecated in newer versions) (#328) 2016-03-08 20:18:51 +01:00
FrancescoUK 4bbacf6923 Code reformatting 2016-03-08 18:04:15 +00:00
FrancescoUK 38ea682c88 Add favicon 2016-03-08 18:00:33 +00:00
FrancescoUK cc05f9b2df regenerate dist files (#116 #328 #329) 2016-03-08 12:44:42 +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 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