1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-11 22:24:21 +01:00
Commit Graph

6629 Commits

Author SHA1 Message Date
Sylvain
778956e9f9 (security) CVE-2020-36599 2022-09-05 10:28:45 +02:00
Sylvain
2c1ced5223
Merge pull request #394 from sleede/dependabot/bundler/omniauth-1.9.2
Bump omniauth from 1.9.1 to 1.9.2
2022-09-05 10:22:45 +02:00
vincent
f21a68593a stock (wip) 2022-09-02 18:17:15 +02:00
vincent
a5a45ee1ce Store settings + update text editor options 2022-09-01 18:02:22 +02:00
vincent
27a3bdc308 Admin orders (tmp) 2022-09-01 16:08:37 +02:00
dependabot[bot]
3a815cacbe
Bump omniauth from 1.9.1 to 1.9.2
Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.1...v1.9.2)

---
updated-dependencies:
- dependency-name: omniauth
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-31 19:13:40 +00:00
vincent
539d89cf8e Fix accordion 2022-08-31 11:15:28 +02:00
dependabot[bot]
9034d6319a
Bump moment-timezone from 0.5.34 to 0.5.35
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.34 to 0.5.35.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.34...0.5.35)

---
updated-dependencies:
- dependency-name: moment-timezone
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-31 05:49:33 +00:00
Sylvain
f21beeaee7 (api) OpenAPI prices index endpoint 2022-08-30 14:16:49 +02:00
Sylvain
4319ea9bce (api) OpenAPI plans categories index endpoint 2022-08-30 13:11:08 +02:00
Sylvain
657723bc22 (api) OpenAPI plans endpoints
index and show endpoints
2022-08-30 12:58:44 +02:00
Sylvain
4c3aa59bc0 (api) openAPI spaces endpoints
index spaces and show a space
2022-08-30 12:18:09 +02:00
Sylvain
5429e9889f (security) log4j format message lookup disabled by default 2022-08-30 11:08:00 +02:00
vincent
2e696f94fd (wip) Admin orders list 2022-08-29 19:15:10 +02:00
Sylvain
b9c02742a1 (bug) unable to generate statistics 2022-08-29 17:34:09 +02:00
vincent
78683a31b3 Style cart 2022-08-29 16:32:35 +02:00
vincent
5791e6076d Merge remote-tracking branch 'origin/product_store-store' into product_store-inte 2022-08-29 10:32:14 +02:00
Du Peng
6d39e4a6ee Merge branch 'product_store-payment' into product_store-store 2022-08-29 08:57:21 +02:00
Du Peng
b669316e43 request user login when checkout a cart 2022-08-28 23:31:43 +02:00
Du Peng
631d5889c0 refactoring create cart service 2022-08-28 23:23:58 +02:00
Du Peng
ea535d86b2 add checkout policy 2022-08-27 18:59:59 +02:00
Du Peng
c80198603e set customer of cart dont save before payment 2022-08-27 18:01:25 +02:00
Du Peng
0f7b99c8a9 add a function return the currency symbol 2022-08-26 20:14:15 +02:00
Du Peng
981cffa27d pay cart with coupon code 2022-08-26 20:10:21 +02:00
Du Peng
3a669109b5 order extends to payment document 2022-08-26 15:56:20 +02:00
Du Peng
453954e2b9 save payment gateway object after pay an order 2022-08-26 15:30:51 +02:00
Du Peng
e3dfe4935a set default value of order_item_id in update_stock 2022-08-26 14:08:20 +02:00
Du Peng
8d52768031 set operator_profile_id after payment 2022-08-26 14:07:18 +02:00
Du Peng
5030f5e1bc fix bug: user cant pay order by wallet 2022-08-26 13:37:23 +02:00
vincent
e339cc18e7 merge product_store-store 2022-08-26 12:12:35 +02:00
Du Peng
218a9cbddc Merge branch 'product_store-payment' into product_store-store 2022-08-26 12:04:45 +02:00
Du Peng
e7d5cbfb2e show an error if payment success but payment_state != paid 2022-08-26 12:04:19 +02:00
Du Peng
ded92dfb89 show error if cart update failed 2022-08-26 11:57:53 +02:00
Du Peng
49aa54193d rename operator id to operator_profile_id in order 2022-08-26 11:55:35 +02:00
Du Peng
7c59d44785 add payment method in order after payment 2022-08-26 11:24:42 +02:00
Du Peng
939927fb73 add wallet transaction id to order 2022-08-26 11:19:09 +02:00
Du Peng
8059512f19 add order item id to product stock movement for sold 2022-08-26 11:06:09 +02:00
Du Peng
97ee15cf78 rename order amount to total 2022-08-26 10:46:30 +02:00
vincent
42c38a0dd7 Remove filters logic from the front-end 2022-08-26 09:46:35 +02:00
Du Peng
885db68b51 add coupon component 2022-08-25 20:50:15 +02:00
vincent
4e76396dee Store ad on machines list 2022-08-25 18:46:55 +02:00
vincent
d602087710 Clients' store categories 2022-08-25 17:08:43 +02:00
Du Peng
d9687a007b fix various bugs for cart 2022-08-25 16:23:00 +02:00
Du Peng
8a8ce607b7 check product is valid and in stock before payment 2022-08-25 11:46:14 +02:00
Du Peng
193c21a583 payment of cart by stripe/payzen/local 2022-08-25 08:52:17 +02:00
vincent
e0dc008d4c Client side product list + product view 2022-08-24 18:34:34 +02:00
Sylvain
a49b702bd1 (doc) updated changelog 2022-08-24 17:31:07 +02:00
Sylvain
e98776d51f Merge branch 'dev' for release 5.4.16 2022-08-24 17:10:10 +02:00
Sylvain
c8110368b7 Version 5.4.16 2022-08-24 17:10:00 +02:00
Sylvain
69e1889462 (bug) allow version/merge commit messages 2022-08-24 17:09:23 +02:00