mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-31 12:41:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
954 Commits 37 Branches 39 Tags
6b76e28ebbfdb9aa6d2fbb3b56276054f4c8a930
Commit Graph

58 Commits

Author SHA1 Message Date
FrancescoUK
7b09961075 fix employee tab width issue, now working fine (#116) 2016-02-28 15:02:25 +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
jekkos
d3b87189e3 Fix form submission in sales and receivings forms (#116) 2016-02-27 21:31:44 +01:00
jekkos
fd87c59492 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 
Conflicts:
	application/views/partial/header.php
	application/views/receivings/receiving.php
	application/views/sales/register.php
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php
 2016-02-27 18:55:44 +01:00
FrancescoUK
d04fec09d5 Sales register and Receiving with new dropdown and relayout (#116) 2016-02-26 23:33:05 +00:00
FrancescoUK
e814f8835a fix issue related to double bootstrap.js in min.js preventing bootstrap-select from functioning properly (#116) 2016-02-26 22:20:11 +00:00
jekkos
7769334372 Add close button by default (#116, #361) 2016-02-26 19:08:49 +01:00
jekkos
959f7da876 Fix item form submission + remove invalid char before value attribute 2016-02-26 11:05:55 +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
FrancescoUK
abdf2a23d0 add bootstrap-table but not used yet (#116 #293) 2016-02-23 15:50:04 +00:00
jekkos
deb4a501d6 Finish config module restyle (#116) 2016-02-22 23:44:52 +01:00
FrancescoUK
349da7e7ad fix font issue, split bootstrap.min.css out of opensourcepos.min.css, grunt upgrades header.php and login.php (#329, #116) 
requires npm install to install bowercopy
 2016-02-21 19:14:04 +00:00
jekkos
1aa5c72db3 Tune css inclusion (use negation for unwanted files in header.php) 2016-02-20 15:08:29 +01:00
FrancescoUK
fc20b74b57 fix wrong css file sequence generation with grunt, add bootstrap-select (not used yet) (#329) 2016-02-19 23:31:18 +00:00
jekkos
ab87b30423 Update .gitignore to exclude intermediate minified files 2016-02-19 19:04:14 +01:00
jekkos
0ad30370ae Do not include login.css in minified result (#329) 2016-02-19 19:04:06 +01:00
jekkos
30223c38e1 Fix css minification (#329) 
Fix suspended sales dialog (set class to modal-dlg)
 2016-02-19 19:03:56 +01:00
jekkos
d2a11cdb91 Bootstrappify config forms - WIP (#116) 2016-02-18 23:30:21 +01:00
jekkos
82a3f9a3e2 Add new dialogs to all pages (use modal-dlg class) #116 
Bootstrapify customer edit form (almost done)
Bootstrapify item excel impor
 2016-02-17 23:34:53 +01:00
jekkos
c99ef3f315 Bootstrapify item edit form (#116) 
Use bootstrap-dialog in items inventory and inventory details (#328)
 2016-02-16 23:42:20 +01:00
jekkos
a97929f239 Remove thickbox from bower.json (#328) 
Items edit working now (items module only) (#116)
 2016-02-16 21:41:02 +01:00
jekkos
444ba37eb1 Import bower compatible dependencies using bower+grunt (#329) 
Cleanup obsolete js + css files (jquery-ui)
 2016-02-15 22:52:58 +01:00
FrancescoUK
f92082270d add locale js for bootstrap-datetimepicker and regenerated min.js (#116) 
locale not tested, js script seems unaffected
 2016-02-14 23:32:50 +00:00
jekkos
d003239525 Items form bootstrapified (working in Chrome) (#116, #328) 2016-02-13 14:42:01 +01:00
FrancescoUK
8438942b10 use bootstrap-datetimepicker instead of jquery-ui-timepicker-addon in Items and Takings (#116) 
There is an issue with Takings filtering that needs fixing and also arrows are not showing in the datetimepicker.
 2016-02-13 12:29:15 +00:00
FrancescoUK
e0745b5109 make flatly OSPOS default, tidied up stylesheets, added bootstrap-datetimepicker js no support yet (#116) 2016-02-13 09:54:49 +00:00
FrancescoUK
23b086fbc2 added jasny-bootstrap-3.1.3, removed bootstrap.file-input and changed image upload in general config (#116) 
For jasny-bootstrap-3.1.3 see: http://www.jasny.net/bootstrap/
 2016-02-12 09:32:21 +00:00
FrancescoUK
e35bd81c8b Fix File Choose boostrap jQuery plugin not working with latest submission (#116) 2016-02-11 08:13:06 +00:00
jekkos
3f12930223 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 
Conflicts:
	application/views/partial/header.php
	dist/opensourcepos.js
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php
 2016-02-11 08:00:47 +01:00
jekkos
715eac28c8 Add jquery-migrate-1.3.0 (solves js issues) 2016-02-11 07:00:02 +01:00
FrancescoUK
e99b9cbe41 Make choose file in General Configuration bootstrap (#116) 
Used following jQuery plugin: http://gregpike.net/demos/bootstrap-file-input/demo.html
 2016-02-10 23:27:28 +00:00
jekkos
32cbf109a4 Fix javascript minification in Grunt build 
Fix config tab navigation in bootstrap (#116)
 2016-02-10 17:25:19 +00:00
jekkos
b6d57a8f0e Add bootstrap 3.3.6 js file (needs jquery 1.9 minimum!) 
Upgrade jquery to 1.12.0, remove older version + rebuild using grunt
Remove obsolete css for tabcontent
Remove 'custom' javascript for tabs in config module (#116)
 2016-02-10 17:24:16 +00:00
jekkos
5c95e02eac Fix javascript minification in Grunt build 
Fix config tab navigation in bootstrap
 2016-02-10 08:43:01 +01:00
jekkos
634e626717 Add bootstrap 3.3.6 js file (needs jquery 1.9 minimum!) 
Upgrade jquery to 1.12.0, remove older version + rebuild using grunt
Remove obsolete css for tabcontent
Remove 'custom' javascript for tabs in config module
 2016-02-09 19:41:38 +01:00
FrancescoUK
7e269f1256 Change to bootstrap notification bars, cleanup old css files, moved styles to ospos.css, fixed ospos_print.css (#116) 2016-02-08 19:30:26 +00:00
jekkos
2520970698 Fix comment for autogenerated sql files (#301, #258) 2016-01-25 08:42:15 +01:00
FrancescoUK
8f72756737 Add a live clock functionality (#298) fix Gruntfile.js (#297) 2016-01-24 22:34:05 +00:00
jekkos
6d5c192447 Add jquery-ui slider for datepicker #169 2015-10-17 00:22:57 +02:00
FrancescoUK
1b90ac14d2 #169 regenerate dist/ js scripts adding datetimepicker jQuery plugin 2015-10-15 19:12:50 +01:00
jekkos
c843c174ed Initialize table sorting if this didn't happen when the page was loaded 
initially (#139)
 2015-09-14 08:26:41 +02:00
jekkos
b680cdff36 Fix table sorting after loading search results 2015-09-07 08:35:59 +02:00
jekkos
e62df579f1 Keep last row in position even after filtering 2015-09-06 13:33:12 +02:00
jekkos
2b6b3914a7 Mark totals row as static (keep it at bottom of the table issue #131) 2015-09-06 13:19:32 +02:00
jekkos
9281995029 Fix payment summary update on search 
Merge branch 'master' of https://github.com/daN4cat/opensourcepos into daN4cat-master
 2015-09-04 23:14:06 +02:00
jekkos
f36c700129 Add date filtering in sales overview 
Add jquery-ui datepicker
Format dates in sale and receiving forms according to configured
dateformat and timeformat settings
Add missing translations in sale (click delete when not selecting
anything)
Add search box back to search for customer sales and ticket numbers
 2015-09-04 22:09:24 +02:00
jekkos
517363b485 Fix deleted checkbox in items form 
Clear suggestion cache when toggling deleted filter
 2015-08-18 18:10:00 +02:00
jekkos
011caf375f Apply is_deleted in item suggestion search 2015-08-18 08:35:21 +02:00
jekkos
4ab2ec1b5b Add supplier attribute search for items (pull request #106) 
Add company name to supplier column in summary report
 2015-08-16 15:41:39 +02:00
jekkos
7926a05948 Regenerate language files 
Remove committed merge conflict in giftcard_numbering.js
Add sql upgrade script for 2.3.3
 2015-08-07 17:17:53 +02:00