Commit Graph

5951 Commits

Author SHA1 Message Date
merdan 79110aa992 Notifications 2021-11-28 20:23:58 +05:00
merdan 46b5577ce6 Merge remote-tracking branch 'github/1.1' into 1.1
# Conflicts:
#	plugins/tps/birzha/components/OfferForm.php
2021-11-28 20:22:27 +05:00
merdan be9126c018 Notifications 2021-11-28 20:13:09 +05:00
saparatayev 049f3c993d more beautiful bank info block - balance page 2021-11-26 16:30:09 +05:00
saparatayev b8885f7831 restyle third step form
new assets - css, js, img
2021-11-25 16:55:31 +05:00
merdan 10c2011414 before notify 2021-11-25 15:00:04 +05:00
Meylis Gazakow d6a24207f9 Merge branch '1.1' of https://github.com/merdiano/birzha into 1.1 2021-11-24 22:11:41 +03:00
Meylis Gazakow b4d1c7dca4 Phone box in register 2021-11-24 22:11:06 +03:00
saparatayev 3a792a956a fix: show message about filling up a balance 2021-11-24 17:17:52 +05:00
saparatayev a274592757 fix: product price cannot be too large 2021-11-24 16:50:40 +05:00
saparatayev 2ec5353737 enhance: new third step & post publication process 2021-11-24 16:33:07 +05:00
Meylis Gazakow 1415dee373 new changes 2021-11-23 22:13:37 +03:00
saparatayev 4f3c20e76a contact form db changes 2021-11-23 13:25:27 +05:00
saparatayev 8655daf30a Merge branch '1.1' of https://github.com/merdiano/birzha into 1.1 2021-11-22 21:15:10 +05:00
saparatayev a35ee6314d delete standard contact form plugin 2021-11-22 21:14:50 +05:00
merdan ddca873360 Merge remote-tracking branch 'github/1.1' into 1.1 2021-11-22 18:46:56 +05:00
saparatayev 966a7124d6 additional models: products api 2021-11-22 18:17:07 +05:00
merdan 8908e0bec6 Merge remote-tracking branch 'github/1.1' into 1.1 2021-11-22 14:55:05 +05:00
merdan ae2bcd9b5e transaction balance page prodlenie, udalenie 2021-11-19 20:15:59 +05:00
saparatayev eba1290275 plugins update 2021-11-18 20:22:28 +05:00
saparatayev f62cd0b864 Merge branch '1.1' of https://github.com/merdiano/birzha into 1.1 2021-11-15 16:39:17 +05:00
saparatayev 33bebe0a1e approved post delete confirm 2021-11-15 16:20:44 +05:00
merdan 23dd1bb1fa Merge remote-tracking branch 'github/1.1' into 1.1 2021-11-15 15:41:55 +05:00
merdan 5f182c96f3 transaction balance is ready for testing 2021-11-13 18:55:35 +05:00
merdan 94881d1ff6 transaction balance is ready for testing 2021-11-13 18:55:19 +05:00
Meylis Gazakow f71a82b5e5 js correction 2021-11-12 20:42:38 +03:00
saparatayev 26c464c435 Merge branch 'sapar' into 1.1 2021-11-12 16:19:03 +05:00
saparatayev 794c3c22f5 fix: frontend mobile 2021-11-12 16:13:20 +05:00
merdan c6a554c142 Merge remote-tracking branch 'github/1.1' into 1.1 2021-11-12 11:51:36 +05:00
merdan f77f5d104f transaction balance 2021-11-12 11:51:19 +05:00
saparatayev aa18c74e4e settings: added bank info 2021-11-10 18:07:58 +05:00
saparatayev b9fbd69689 translations for bank data in lang.yaml 2021-11-10 17:09:03 +05:00
saparatayev 4914d36cc5 Merge branch '1.1' of https://github.com/merdiano/birzha into 1.1 2021-11-10 16:09:52 +05:00
saparatayev 195897d48f merge with meylis changes 2021-11-10 16:09:00 +05:00
saparatayev 2ae97d2f15 three dots, OK buttom 2021-11-10 13:45:08 +05:00
saparatayev 68a38f1a35 fix: bank data 2021-11-10 13:35:22 +05:00
Meylis Gazakow bf8fbd88c9 last sapar changes asked 2021-11-09 18:51:33 +03:00
merdan fb50ccddb6 ukraska listow produkts i paymants wadminki dobavlena knopka approve decline na paymenrt 2021-11-09 19:11:32 +05:00
saparatayev 184c1cc881 changed categories name 2021-11-09 17:58:52 +05:00
saparatayev 4f3559b076 fix: payment_type is required field 2021-11-09 17:41:30 +05:00
saparatayev 0ef37c2369 fix: balance validation 2021-11-09 17:24:24 +05:00
Meylis Gazakow 36a6477363 Merge branch '1.1' of https://github.com/merdiano/birzha into 1.1 2021-11-09 17:19:25 +03:00
Meylis Gazakow 85d192b69a hope last changes 2021-11-09 17:18:58 +03:00
merdan bf90330285 Merge branch '1.1' of https://github.com/merdiano/birzha into 1.1 2021-11-09 11:38:46 +00:00
saparatayev 1ff1b66b6d Merge branch '1.1' of https://github.com/merdiano/birzha into 1.1 2021-11-09 16:35:31 +05:00
saparatayev 252307e241 fixes 2021-11-09 16:35:00 +05:00
Meylis Gazakow 4f4fa57815 add icon 2021-11-09 13:44:08 +03:00
merdan 8b28cf88e8 trade terms html 2021-11-09 08:14:07 +00:00
Meylis Gazakow 00c25dac54 new changes 2021-11-08 22:16:45 +03:00
saparatayev ce00864733 bar yok 2021-11-08 15:24:12 +05:00