mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-09-18 00:17:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,081 Commits 50 Branches 39 Tags
340792cfc2fe56df2e7de641fdb29cb1a0b7ff64
Commit Graph
82 Commits
Author SHA1 Message Date
FrancescoUK c124c08f89 readded bootstrap-select and adjusted styling of dropboxes (#116) 2016-03-12 10:57:24 +00:00
FrancescoUK 019f93d98b create style class for table width and first_li, regenerate dist files (#116) 2016-03-11 17:26:11 +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 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
FrancescoUK 70938f7b41 sales/register bootstrapisation (#116) 2016-03-10 19:20:42 +00:00
FrancescoUK 1f1b9c47ec remove extra barcode font styling, set directly the correct size as of barcode_config (#116) 2016-03-09 14:24:16 +00:00
FrancescoUK ea394a00b5 remove spinner, unused images, unused code (#116 #328) 2016-03-08 12:42:38 +00:00
FrancescoUK 49b1eb3150 fix table action & search header geometry/positioning (#116) 2016-03-08 12:40:41 +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
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 7b09961075 fix employee tab width issue, now working fine (#116) 2016-02-28 15:02:25 +00: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 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 7236902143 restore correct style for the main page module list (#329) 2016-02-19 23:30:42 +00: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 967ba99c12 Merge branch 'feature/bootstrapUI' of https://github.com/jekkos/opensourcepos into feature/bootstrapUI 
Conflicts:
	application/views/configs/locale_config.php
	application/views/receivings/receiving.php
	application/views/sales/register.php
 2016-02-18 23:38:39 +01:00
FrancescoUK ee4297e22c fix sales/register and receiving button, styles, alignment and code tidy up (#116) 2016-02-18 21:16:07 +00: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 3156ce217b upgrade to latest flatly bootstrap.css (#116) 2016-02-14 23:24:42 +00:00
FrancescoUK 7c10a9a63a rename font directory to fonts so we are inline with bootstrap (#116) 2016-02-14 23:03:32 +00:00
FrancescoUK d788320a9d Tidy up js in Sales/manage and Items/manage, commented out invoice js part as not used (#116) 2016-02-14 19:42:08 +00:00
FrancescoUK d69a3c6130 Fix tables (detailed sale report) colour for inner table (#116) 2016-02-13 21:47:10 +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
jekkos b1b125d2a4 Trigger cachebreaker in all header.php files 
Apply center-align style for barcode only on receipt
Remove obsolete tabcontent.js
Update js scritps in spacelab header
 2016-02-09 20:02:16 +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 b27d94e316 Merge branch 'ci3' into bootstrapUI 2016-02-08 20:19:15 +00: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 f9c882bf24 Fix spacing in autocomplete suggestion 2016-02-08 17:01:37 +01:00
FrancescoUK f6356dd9e6 Fix more buttons to be bootstrap ones, fixed sales register, removed old style assets (#116) 2016-02-08 12:12:05 +00:00
FrancescoUK 8bf77e27dc Change header template (#116) 2016-01-24 10:39:58 +00:00
FrancescoUK a51352017a Overriding view files (#116) 2016-01-24 10:39:58 +00:00
FrancescoUK 3c22f9069b Restore padding in pagination links, now it uses css (#120) 2016-01-17 19:02:08 +00:00
FrancescoUK 6aa5126bf0 #269 fix https error issue 2016-01-04 17:55:00 +00:00
jekkos 56859a77ab Fix path for jquery-ui icons (#207) 2015-10-20 13:23:20 +02:00
jekkos 6d5c192447 Add jquery-ui slider for datepicker #169 2015-10-17 00:22:57 +02:00
FrancescoUK 0d87fc51d9 #169 Add a date time picker to sales/form such user can edit transaction date not in a manual manner 
Needs more testing with different date & time formats and sorting out of min.js
 2015-10-14 11:40:59 +01: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 a624d21fcd Fix sale detail edit 
Make last row in sale table bold (css)
Add default date range between yesterday and today
Temporarily comment out payment type listing in table itself (tbd)
 2015-09-04 08:44:20 +02:00
jekkos 9a2cafc1b1 Review payment type overview 
Add some padding to bottom of content area
Fix invoice only searching
Make start and end dates optional
 2015-09-03 23:35:57 +02:00
jekkos 80dcc2f63f Increase waiting timeout for phantomjs test 
Revert old database script
Add styling rules for number typed input fields
 2015-07-14 12:36:43 +02:00
jekkos 95ae2766cd Giftcard get_all parameters were in opposite order 
Invoice layout improvements
 2015-04-06 15:15:40 +02:00
jekkos-t520 0e357f14f6 Add option to show total discounts on receipt 2015-03-05 08:28:58 +01:00
jekkos-t520 b2f76f3fe6 Improve thai translation (Merge Pull Request #20) 
Improve login screen
 2015-02-26 21:55:55 +01:00