Commit Graph

374 Commits

Author SHA1 Message Date
5ff974c717 add feature clear card 2016-04-03 10:44:12 +02:00
2647ca6aa6 add editable giro pay date 2016-04-03 09:05:39 +02:00
bd5406f8be change version to v.0.056 2016-03-30 21:24:44 +02:00
a12b87d3be add inventory admin fix, add procurement update 2016-03-30 20:04:49 +02:00
19761cb0cc change version v.0.0.55 2016-03-25 20:11:52 +01:00
51b28134c1 add feature payout_later 2016-03-25 19:05:42 +01:00
b84ebf0177 add transfer later 2016-03-24 21:35:22 +01:00
ed837d6580 add inventory to frontend 2016-03-24 07:44:00 +01:00
e7b16f20ce add inventory changes 2016-03-23 08:15:37 +01:00
7db129de92 add ticket usage count increment trigger, add log, fix card flag update query, fix customer card move update 2016-03-20 15:36:05 +01:00
1d5a5be5bf fix detsta download, fix card move card update 2016-03-18 10:21:28 +01:00
16d25abd7c add log table 2016-03-17 07:34:11 +01:00
1c090b01b0 change version 2016-03-11 21:49:07 +01:00
0fc5ab01bc inventory changes 2016-03-11 21:46:59 +01:00
9c25312cf1 status flag 2016-03-11 07:41:51 +01:00
bc74d92463 change version to v.0.0.52 2016-03-09 20:26:22 +01:00
8f85d99a0a fix merge conflicts 2016-03-09 20:24:31 +01:00
42c326f407 add card.flag implementation 2016-03-09 20:16:19 +01:00
0f973170d2 fix transfer storno - delete carts 2016-03-07 22:32:23 +01:00
2184abdf97 Add delete contract 2016-03-07 22:12:51 +01:00
1d3c476476 work on inventory 2016-03-07 20:54:32 +01:00
ead52ae09b add reception account transfer/mixed 2016-03-04 21:46:31 +01:00
da96c64348 Finish contract_date 2016-03-03 07:58:51 +01:00
fd4122a983 add contract started_at field 2016-03-03 07:57:17 +01:00
11abfc54f4 add payment method colum and money total to backend/transfer/index 2016-03-02 08:07:33 +01:00
055fc541ea change version 2016-03-01 22:17:32 +01:00
80b8f5a238 change procurement product selection, keytoggle redirect change 2016-03-01 21:18:39 +01:00
b196b86746 add inventory group 2016-02-29 20:51:54 +01:00
35accca381 add property common > config > components > assetmanager > timestamp = true 2016-02-28 16:29:58 +01:00
2e3a8d53ca Fix hide reception cart
- add property user_cart_on
- add property product_sale_default_focus
- add property ticket_create-price_editable
- add discount product/ticket enabled
2016-02-28 15:48:30 +01:00
75aeb64b19 detsta import improvements, procurement changes 2016-02-26 21:19:51 +01:00
6efbfa7d9b improve detsta 2016-02-25 19:33:04 +01:00
3b7f42014b add reception redirection change when card with key read 2016-02-24 21:40:21 +01:00
ae212eddd4 change version to v.0.0.40 2016-02-22 21:54:23 +01:00
29a8b440b2 Add ContractForm, Add contract pdf, Add Display all Transfer option 2016-02-21 21:41:25 +01:00
462e93c740 remove temporarly 3 days check from daily listing 2016-02-20 11:04:03 +01:00
a36da9a3c9 change version to 0.0.38 2016-02-19 21:35:46 +01:00
4aa17e5210 Add key controller to add/update keys , add bakcend skin param 2016-02-19 21:33:06 +01:00
84e2badd34 fix backend user access, fix payout cart account change 2016-02-18 22:51:55 +01:00
0ce6958e0b add id_account to door log, add key import to backend with no menu 2016-02-16 21:42:13 +01:00
6221945bb7 Add company to login email 2016-02-16 18:45:24 +01:00
769b5d16de Add door log changes, direction types, and manual reading event 2016-02-16 18:37:16 +01:00
f81af9e5bb add forgóvilla táblák 2016-02-15 07:42:33 +01:00
70f43468af add contraint , that everybody expect admin is limited to 3 days, Add card package 2016-02-13 17:23:43 +01:00
b871022329 add inventory 2016-02-03 22:50:17 +01:00
41de4ee6a7 add limit, that users can see only 3 days old data 2016-02-02 22:05:29 +01:00
20d57fd3cf fix ticket discount calc on create 2016-02-02 08:09:09 +01:00
e9bdcb715d fix discount , using floor method, change version to 0.0.30 2016-02-01 21:48:39 +01:00
a00331ce7c add indexes, add messagedetsta 2016-01-29 17:13:33 +01:00
ad59cbb940 change version to v.0.0.29 2016-01-27 09:04:15 +01:00
2291ca5ff4 add daily listing by paid_by, add customer cart details 2016-01-27 09:01:02 +01:00
9fb349ee64 add change card, add customer tab 2016-01-25 23:09:43 +01:00
8d29f47d49 add contract, add door_log 2016-01-25 12:50:14 +01:00
0c3ff2c0f3 add contract to detsta processor 2016-01-25 09:17:09 +01:00
df14401b28 add contract 2016-01-25 01:43:19 +01:00
fd4d38ab44 fix GiroUzenetsorszam case sensitive file/class name, change version to v.0.0.26 2016-01-22 20:11:17 +01:00
33c6f46ce9 change version to 0.0.25 2016-01-22 19:25:34 +01:00
027a96790a add reception key changes, add money movent storno, status display 2016-01-22 19:10:30 +01:00
a2a6b1f240 add ticket installment 2016-01-22 14:45:56 +01:00
d7cc84e78f add kulcsok, add tartós beszedés, add ticket type with intallments 2016-01-20 14:48:34 +01:00
d1638a19de change version to v.0.0.24 2016-01-17 16:44:56 +01:00
d043759b1d add payment method 2016-01-17 16:21:37 +01:00
abb69ce92d fix small bugs 2016-01-17 08:23:48 +01:00
4f255ad93d change version to v.0.0.2 2016-01-17 07:10:02 +01:00
272d2d4f8a fix merge conflicts 2016-01-16 19:11:01 +01:00
c27ca44a5b change version to 0.0.21 2016-01-16 19:07:20 +01:00
614de5ff1b fix barcodue uniqe on admin , ticket use status=active , when checking 2016-01-16 19:02:06 +01:00
fbb2d7e5dc add cassaopen/default account behaviors 2016-01-12 17:19:34 +01:00
a782232ad8 change account dropdown to fix account on account state open/close 2016-01-10 17:32:54 +01:00
7c584a0779 add display money to account state close, delete ticket on customer tickets 2016-01-10 15:25:25 +01:00
5a98d128bc fix file_get_contents in helper 2016-01-08 23:22:06 +01:00
4ddcf9ac68 change version v.0.0.20 2016-01-08 22:52:59 +01:00
b83d13ad2f add login email sending 2016-01-08 22:49:18 +01:00
0084526094 add account state changes 2016-01-08 19:09:42 +01:00
0e023e3f3e change version to v.0.0.19 2016-01-08 14:18:19 +01:00
e8df61f123 add reception account state view and pdf export 2016-01-08 14:06:55 +01:00
6d2e15cac7 add reception customer search, fix reception ticket types, fix card number routing, timezone changes 2016-01-06 21:20:21 +01:00
39ae361505 add transfer#list pdf download, fix helper#fixascii function 2016-01-06 16:18:15 +01:00
932f071c13 change version to v.0.0.16 2016-01-04 22:42:12 +01:00
1e206011d0 change cart to plain post from ajax 2016-01-04 22:02:59 +01:00
2d9b527909 small changes 2016-01-04 09:01:20 +01:00
94c3a17075 replace on cardsaving ö to 0 2016-01-04 08:58:44 +01:00
42079ce9b2 add assetmanger timestamp version 2016-01-03 19:33:45 +01:00
dcb4e862b3 change version to v.0.0.14 , add admin menu changes, add collection change 2016-01-03 19:16:44 +01:00
595f663820 add hidden account, cart insert/delete
add hidden account support
add delete/payout buttons to carts
add backend product sales with pdf export
add frontend product sales with pdf export
add frontend ticket sales with pdf export
2016-01-03 18:29:39 +01:00
62bcb7ff27 change version to v0.0.13 2016-01-01 21:44:19 +01:00
bf1553e97c change version to v.0.0.12 2016-01-01 21:19:09 +01:00
f4963c78d2 change formatter timezone 2016-01-01 21:18:06 +01:00
8b61475054 change version to v.0.0.11 2015-12-31 15:49:04 +01:00
0b58f628ed add reception global word listener,allow delete transactions, allow delete account_state 2015-12-31 15:42:28 +01:00
f59eadd8cc fix account_state ( collection_money ), display product/ticket on reception only for selected account, add daily transfers (reception/admin) 2015-12-31 13:52:22 +01:00
72fc139674 add money movement type 'in', add daily transfers 2015-12-31 00:19:38 +01:00
f9ace80335 change version to v.0.0.10 2015-12-30 12:17:41 +01:00
eb989d5f80 add webcam to customer create/update 2015-12-30 12:02:26 +01:00
135d64e4c8 change version to 0.0.9 2015-12-29 22:34:39 +01:00
6eb0e69b1b add transaction/summary, fix transaction/index, add reception product typeahead 2015-12-29 22:22:11 +01:00
3b2f19b909 add rfid_key to card and key 2015-12-28 21:03:52 +01:00
fd1cf65334 add version changes and edit change log 2015-12-11 23:34:21 +01:00
15c9bc9d01 Finish #58
# Conflicts:
#	backend/config/main.php
2015-12-11 23:27:16 +01:00
b42e6f78e6 add card type 'old', fix frontend notes 2015-12-11 23:15:53 +01:00
rocho
783d889ec7 kulcsok új és szerkesztési nézetek fordítása, legördülő lista alkalmazása type-ra 2015-12-01 17:55:28 +01:00
rocho
4872abbb20 <leirás> 2015-11-30 19:21:27 +01:00
9962a35059 disable csrf fix, fix account state javascript
disable csrf in frontend and backend
	reception account_state javascript fix
2015-11-29 20:19:34 +01:00
09cd4660b8 add csrf , product and account_state changes
csrf - previous settings were not working on dev1
product - allow sale  , if count > stock
prodcut - admin - allow search by name
account_state - auto sum up money from notes

add csrf , product and account_state changes

csrf - previous settings were not working on dev1
product - allow sale  , if count > stock
prodcut - admin - allow search by name
account_state - auto sum up money from notes
2015-11-29 15:04:09 +01:00
a40cfb90d3 Merge branch 'develop' of http://rocho02.ddns.net:4080/gogs/rocho/fitness_web into develop 2015-11-29 12:12:49 +01:00
rocho
d7c08ec60b add key crud 2015-11-29 12:07:21 +01:00
17a339badf change backand request csrf settings 2015-11-29 11:08:04 +01:00
ed80f8720d add Image and Upload helper classes 2015-11-29 08:28:09 +01:00
bcae71155e add backend theme AdminLte, bind reception/transaction to a permission 2015-11-23 19:55:49 +01:00
e13866d7da change version to 0.0.4 2015-11-21 20:46:12 +01:00
07c2d4c36a add translateions 2015-11-21 20:36:46 +01:00
d1fa7e27cf set version v.0.0.3 2015-11-06 19:18:19 +01:00
032707e4f1 add translations 2015-11-06 17:14:23 +01:00
2654a501db add customer ticket statistics 2015-11-06 17:10:25 +01:00
a6e34bff61 Add backend ticket changes 2015-11-06 14:42:16 +01:00
de8991b88f add backend ticket stat basics 2015-11-06 08:57:39 +01:00
f1fd37f615 add version displaying to layouts 2015-11-05 18:23:47 +01:00
6847c6d0e7 add translation fixes 2015-11-05 17:27:14 +01:00
cc83ccf761 add role checking to controllers 2015-11-05 17:24:09 +01:00
43d5598f23 add role to user 2015-11-05 09:26:08 +01:00
cee5d60d9d add translations 2015-11-04 15:56:12 +01:00
16df363e36 remove commented code 2015-11-04 15:42:58 +01:00
4303409fe2 add collections to backend 2015-11-04 15:39:02 +01:00
48a00e4bdc add frontend collection 2015-11-04 12:33:45 +01:00
ed9c1e77cd add collection changes 2015-11-04 08:59:20 +01:00
931b83040b add reception collection basics 2015-11-03 17:27:14 +01:00
33bf52df60 add collection 2015-11-03 09:50:54 +01:00
1ee0a6bbe9 add access control to backend 2015-11-02 14:32:19 +01:00
e34b150d74 add frontend changes 2015-10-30 09:28:58 +01:00
4a04c9efa2 add translations 2015-10-26 08:08:03 +01:00
01da3c470c add default account to frontend 2015-10-26 07:49:10 +01:00
0c92fdf167 add customer cart 2015-10-23 20:39:10 +02:00
23a0390a27 add customer cart 2015-10-21 17:57:16 +02:00
4e04425403 add discount to product sell js 2015-10-21 07:46:15 +02:00
f2e30779f0 add product sell discount js changes 2015-10-20 17:23:52 +02:00
1a1477b26b add changes to backend transfers2 2015-10-20 09:02:57 +02:00
71384b6453 add transfer-moneymovement 2015-10-19 17:22:50 +02:00
ab40f937a3 add money movement crud and table 2015-10-19 10:19:19 +02:00
5be26aa108 add account state translations 2015-10-19 08:09:48 +02:00
9145f21371 add changes to account state 2015-10-19 07:48:46 +02:00
b04cbda645 add backend transfer list changes 2015-10-13 09:27:56 +02:00
fda450b801 add frontend ticket translations 2015-10-09 08:12:39 +02:00
11e7c85cf3 add frontend ticket changes 2015-10-08 17:18:18 +02:00
c3ae414bba add changes to create ticket 2015-10-08 10:13:29 +02:00
2e906de8c2 add ticket basics 2015-10-06 17:20:15 +02:00
48e392b4fd add translations for sell product 2015-10-06 11:38:43 +02:00
8fbe963379 add changes to sell product 2015-10-06 09:29:50 +02:00
2610749305 sell product list 2015-10-05 17:24:26 +02:00
203dfeac72 add js transferlist 2015-10-05 09:17:45 +02:00
36c8d37914 sell product changes 2015-10-05 07:37:17 +02:00
e9f9567618 add changes sell product 2015-10-01 17:31:48 +02:00
e3d6c0b902 add product sale changes 2015-10-01 09:37:34 +02:00
640d04cb76 add reception customer update changes 2015-09-30 11:25:32 +02:00
5d9587d8fd add card and customer translations 2015-09-27 21:49:29 +02:00
7df9800fec add city, customer and card model + crud 2015-09-27 21:35:31 +02:00
35e03b8f1d add small chages 2015-09-25 19:19:08 +02:00
cdb77b7a49 add procurement translatiosn 2015-09-25 19:06:24 +02:00
5c9db98110 add changes to procurement 2015-09-25 17:25:16 +02:00
28caac03dc add changes to procurement 2015-09-25 08:57:05 +02:00
a2b835225a add product 2015-09-24 22:14:09 +02:00
fcc18d79f6 add changes feature/33 2015-09-24 10:06:10 +02:00
db8fca5630 add ticket type model + crud ( bérlet típus) 2015-09-22 11:59:58 +02:00
ab885b13e9 add changes to ticket_type 2015-09-22 09:19:46 +02:00
6b81ced4ba add product category crud + model ( termék kategória ) 2015-09-21 10:35:15 +02:00
8890727862 small fixes 2015-09-21 09:36:44 +02:00
2e7b52e5a3 add discount crud + model (kedvezmény) 2015-09-21 08:45:41 +02:00
6163163b1c add account model + crud ( kassza ) 2015-09-20 22:02:02 +02:00
47341b6396 add Raktár model + crud 2015-09-20 14:55:05 +02:00
381aea4f2b add rbac roles, and and admin role to admin user 2015-09-19 21:25:41 +02:00
7a48ac9d51 finish feature #26 2015-09-19 16:07:52 +02:00
fd181e580f add i18n 2015-09-19 08:57:45 +02:00
5163f1a9a9 add user CRUD 2015-09-19 08:29:47 +02:00
271835ae6b add version param and change log 2015-09-18 21:12:08 +02:00
4edcf5536e initial commit 2015-09-17 22:03:15 +02:00