mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-10 11:10:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,752 Commits 70 Branches 39 Tags
5fa4e18eb706ff1322f80abda91ef1d5205d978b
Commit Graph

1192 Commits

Author SHA1 Message Date
objecttothis
687ae74a62 Update footer.php 
replaced " with ' to prevent the string from being parsed for variables unnecessarily.
 2020-06-27 14:54:39 +04:00
objecttothis
f3ee3d7dbd Update footer.php 
Corrected code to send the ending year to the language line for RTL languages to juggle.
 2020-06-27 14:53:28 +04:00
WebShells
8fc27d88e0 Colors for User Setup section 
Colors for User Setup section
 2020-05-27 10:16:46 +03:00
WebShells
b2bb4d8b62 PHP Declaration 2020-05-27 10:10:52 +03:00
WebShells
ecff38d5bb Language Updates 2020-05-27 09:06:42 +03:00
WebShells
026114457b Minor Changes & Footer Update 
Added timezone checkup to system info

1st Case:
Timezones are the same ( no warning )
2nd Case:
Difference in timezones: Warning will be displayed.

Simplifying OSPOS footer and replacing git project link by OSPOS website.
 2020-05-27 08:56:51 +03:00
objecttothis
a155399ec0 Merge branch 'master' into category_as_dropdown 2020-05-19 18:14:31 +04:00
objecttothis
35023e648f Force Travis-CI to rebuild to demo 2020-05-14 19:35:55 +04:00
objecttothis
ba6826a31e Merge pull request #2824 from opensourcepos/custom_image_upload_restrictions 
Custom image upload restrictions
 2020-05-08 23:59:22 +04:00
WShells
e6dad3eb81 Updating System Info Section (#2805) 
* Updating Permissions Checkup & Fixed Clipboard issue on Mozilla and Other Browsers

* Re-ordering Tabs & Minor Changes

- Re-ordering Configuration Tabs, Merging Configuration/Settings tabs under Setup & Conf
- Minor Changes to Setup & Conf
- Translations Added

* Indent

* Minor Changes

* Dir Fix 

* Fixing Listing Sign

* Fixing Listing Sign in Warning messages
 2020-05-08 20:14:48 +03:00
objecttothis
b3b7b227a9 Fixed problem with Images not deleting 2020-05-08 16:52:35 +04:00
objecttothis
68a2489e13 Add Save logic 
- Corrected minimum image size value in migration script
- Added save logic to save_general() in Config controller
- Added logic in the index() of the Config controller to properly prep
allowed_image_types data
 2020-05-08 15:58:37 +04:00
objecttothis
59142d9f69 Database logic additions 
- Migration script to create default values
- Corrected naming of variables in general_config.php
- Replaced hardcoded values with db variables
 2020-05-08 14:22:49 +04:00
objecttothis
a79e9dd4cb Changes to allow custom image restrictions in view. 
- Added the fields to the general config view.
- Added Language lines to en_US and en_GB
- Corrected formatting of Columns in search suggestion layout
 2020-05-08 13:15:13 +04:00
objecttothis
ee860e3b71 Disable fields on category_dropdown attribute view 
- These changes prevent the type of attribute to be changed from
dropdown for categories as dropdown.
 2020-05-05 14:06:11 +04:00
objecttothis
1dc3e15a55 Implement dropdown into item form view 
- Created business logic in view to show dropdown if enabled
- Created business logic in controller to calculate key/value pairs of
dropdown
- Adjusted attribute model get_definition values to send values also if
definition_id is -1 or > 0 but not 0 which is what we are now using as
no definition instead of -1
 2020-05-05 11:59:03 +04:00
objecttothis
15a987cfd9 Adjust functions related to attributes 2020-05-04 17:00:02 +04:00
objecttothis
231fe483d9 Add Config to enable show Category as dropdown 
- Added the config item and label to view.
- Added the language line in en_US and en_GB.
- Added save business to Config controller.
- Fixed formatting issues in Config controller (removed tabs on blank
lines)
 2020-05-04 15:23:50 +04:00
objecttothis
06eebc2ad3 Make DROPDOWN values sorted by alphabet. 2020-05-01 17:51:13 +04:00
WShells
7e49a7b82a Indent... 2020-04-18 05:56:44 +03:00
WShells
5fe3b2ff00 Updating Dir/File Location 2020-04-18 05:48:50 +03:00
WShells
11f2f1eafa Updating Copy to Clipboard 
Updating Copy to Clipboard Function Supporting Mozilla Firefox Again
 2020-04-18 05:46:18 +03:00
blutme
64b2843cf6 loginButton Update login.php 
the "loginButton" valule had no translation when changing languages.
 2020-04-12 18:27:08 -05:00
objecttothis
4584b7eace Final indentation and formatting fixes 2020-03-24 14:17:36 +04:00
objecttothis
3281fc9bb0 Correct indentation problems 2020-03-24 14:04:04 +04:00
objecttothis
fb9fec1a10 Merge branch 'master' into pos_bool 2020-03-18 16:19:45 +04:00
FrancescoUK
3382610871 Merge pull request #2760 from opensourcepos/attribute-colon-patch 
Removing the restriction for colons in the name
 2020-03-14 07:18:44 +00:00
jekkos
531035fef2 Update invalid chars 2020-03-13 22:41:42 +01:00
objecttothis
ecb21d2d5e Same correction for removing attribute value 2020-03-13 16:38:18 +04:00
objecttothis
a2a5db8901 Correct a bug causing & to break in POST 
See #2758 for details
 2020-03-13 16:32:39 +04:00
objecttothis
04ade7ab0b Removing the restriction for colons in the name 
Please see #2665
 2020-03-13 13:22:23 +04:00
objecttothis
ea7cb48f1c CHECKBOX Attribute type 
Conversion from DROPDOWN or TEXT logic
 2020-03-02 14:17:48 +04:00
FrancescoUK
cdaf88ef28 Fix Employee autocomplete bug (#2736) 2020-03-01 17:34:39 +00:00
objecttothis
d7a59221fc Fix problem with unchecked attributes 
Previously, if the attribute was unchecked, the form wouldn't submit the
attribute and the model/controller would delete the attribute_link from
the item.  A hidden input type with value 0 occuring before the checkbox
fixes this problem.
 2020-02-27 12:24:04 +04:00
objecttothis
ff79b73e34 Implement CHECKBOX attribute type 
Attribute Configuration view
Attributes section of item management view
Attributes section of CSV item import
 2020-02-25 15:44:49 +04:00
FrancescoUK
efd53cbccf Add Employee name to suspended form (#2678) 2020-02-16 13:46:25 +00:00
FrancescoUK
e0620e1a3e Add more onClick select the text content 2020-02-15 22:44:03 +00:00
FrancescoUK
99d861535e Add allow sales change price permission (#2653) 2020-01-25 17:22:26 +00:00
FrancescoUK
7739994eda Minor indentation adjustment 2020-01-19 20:51:41 +00:00
FrancescoUK
5007410c1a Change Employee input type in Sales edit form 2020-01-19 20:32:57 +00:00
FrancescoUK
b4eabd2265 Fix missing cash refund in sale edit form 2020-01-19 18:24:11 +00:00
FrancescoUK
d08381850d Merge pull request #2668 from opensourcepos/fix-attr-default-date 
Use today as default date in DATETIME attribute (#2666)
 2020-01-12 22:13:59 +00:00
FrancescoUK
472e15ab0a Add detailed supplier report 2020-01-12 20:28:55 +00:00
jekkos
de6a547272 Use today as default date in DATETIME attribute (#2666) 2020-01-09 20:24:32 +01:00
FrancescoUK
351bc544ee Fixed indentation 2020-01-04 10:38:31 +00:00
SteveIreland
5dfe0c237f Add payments to emailed invoice and fix issue with unsupported fonts 2020-01-03 21:01:07 -05:00
FrancescoUK
3b628bed45 Prepare Release 3.3.2 2020-01-03 22:38:57 +00:00
FrancescoUK
91d72c0265 Merge pull request #2641 from opensourcepos/csrf-cookie-prefix 
Add cookie_prefix to csrf cookie name (#2638)
 2019-12-30 11:47:37 +00:00
jekkos
fd3b48ba43 Add cookie_prefix to csrf cookie name (#2638) 2019-12-30 11:29:17 +01:00
FrancescoUK
e03ee00e61 Merge pull request #2639 from opensourcepos/refresh-after-import 
Refresh tables after import + close after invoice email (#478)
 2019-12-29 20:31:23 +00:00