Commit Graph

185 Commits

Author SHA1 Message Date
d2d44e51d9 display comment in transfers/index 2016-07-29 07:59:52 +02:00
fdbd39b059 detsta processing -> move to cart if not successfull, transfer/paymentLater changes 2016-07-27 07:20:47 +02:00
a580b3d295 add backed transfer list chages. Add conffir dkailogsW 2016-07-13 18:37:41 +02:00
3e3cd83945 hide backand\ticket\export pdf button 2016-06-29 21:46:17 +02:00
6a6849a93c add set time limit to backend\ticket\index export pdf 2016-06-29 20:55:59 +02:00
5438c9a038 add backand ticket/index changes, add backand\ticket\index export pdf, xls 2016-06-29 20:18:47 +02:00
afa58973ae add subscriber 2016-05-27 21:00:23 +02:00
85047ec900 add unsibscribe newsletter 2016-05-23 08:16:44 +02:00
e51f4a5934 add newsletter 2016-05-20 08:16:30 +02:00
0ff389fff5 Add make unpaid ticket 2016-05-08 09:22:11 +02:00
f8e1f90a8e Add waste 2016-05-08 08:56:42 +02:00
ad1cae33b3 Finish detsta_part 2016-04-30 12:32:47 +02:00
6458a72936 add multiple detsta upload 2016-04-30 12:32:28 +02:00
72c5e8fa32 add payment later customer description 2016-04-22 22:48:43 +02:00
776e0ea3e0 add ugiro changes 2016-04-18 19:22:53 +02:00
01ada90e8c add transfer unstorno 2016-04-11 21:21:47 +02:00
1d95d37373 add admin edit ticket date 2016-04-10 20:05:18 +02:00
1cbecb415b add user status 2016-04-08 21:48:53 +02:00
a858cedbba add inventory fix 2016-04-07 18:35:33 +02:00
5942a5f9f5 add inventory total price, rename procurement purchase price 2016-04-04 20:40:55 +02:00
a2dcdab49c add change card flag after card clear 2016-04-03 10:51:08 +02:00
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
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
0fc5ab01bc inventory changes 2016-03-11 21:46:59 +01:00
9c25312cf1 status flag 2016-03-11 07:41:51 +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
2184abdf97 Add delete contract 2016-03-07 22:12:51 +01:00
1d3c476476 work on inventory 2016-03-07 20:54:32 +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
cb4a639c96 add backend transfer/index customerName 2016-03-01 22:16:40 +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
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
29a8b440b2 Add ContractForm, Add contract pdf, Add Display all Transfer option 2016-02-21 21:41:25 +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
70f43468af add contraint , that everybody expect admin is limited to 3 days, Add card package 2016-02-13 17:23:43 +01:00
7b4fe04229 Add contract parts
add procurement create prevent enter to product field
2016-01-30 11:48:39 +01:00
a00331ce7c add indexes, add messagedetsta 2016-01-29 17:13:33 +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
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
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
da29702a79 Merge branch 'develop' of http://rocho02.ddns.net:4080/gogs/rocho/fitness_web into develop 2016-01-07 16:31:19 +01:00
d2bc8076ca add import card rfid key 2016-01-07 16:31:06 +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
1e206011d0 change cart to plain post from ajax 2016-01-04 22:02:59 +01:00
94c3a17075 replace on cardsaving ö to 0 2016-01-04 08:58:44 +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
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
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
15c9bc9d01 Finish #58
# Conflicts:
#	backend/config/main.php
2015-12-11 23:27:16 +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
4935aaa4a2 add again admin key menu 2015-11-29 15:41:29 +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
40509961cd add UploadController 'rest' controller 2015-11-27 15:27:46 +01:00
bcae71155e add backend theme AdminLte, bind reception/transaction to a permission 2015-11-23 19:55:49 +01:00
07c2d4c36a add translateions 2015-11-21 20:36:46 +01:00
2654a501db add customer ticket statistics 2015-11-06 17:10:25 +01:00
b3dd9f67e8 change admin menu structure 2015-11-06 15:40:05 +01:00
afac709d04 change admin menu structure 2015-11-06 15:33:58 +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
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