Merge branch 'develop' into 'refactoring/SaleAndSupplierOrderModule'
# Conflicts: # .env # src/shared/sections/product/add-product/MainForm.tsx
Affichage de
- .env 2 ajouts, 0 suppression.env
- path/to/src/shared/sections/product/add-product/ProductProperties.tsx 1 ajout, 0 suppression...shared/sections/product/add-product/ProductProperties.tsx
- src/app/dashboard/page.tsx 5 ajouts, 3 suppressionssrc/app/dashboard/page.tsx
- src/shared/_mock/_cartLive.ts 1 ajout, 0 suppressionsrc/shared/_mock/_cartLive.ts
- src/shared/api/cart.ts 1 ajout, 1 suppressionsrc/shared/api/cart.ts
- src/shared/api/giftcard.ts 10 ajouts, 1 suppressionsrc/shared/api/giftcard.ts
- src/shared/api/product.ts 110 ajouts, 24 suppressionssrc/shared/api/product.ts
- src/shared/api/saleSession.ts 37 ajouts, 1 suppressionsrc/shared/api/saleSession.ts
- src/shared/api/server.ts 5 ajouts, 1 suppressionsrc/shared/api/server.ts
- src/shared/sections/cart/AllVariation/Product-Variation.tsx 111 ajouts, 35 suppressionssrc/shared/sections/cart/AllVariation/Product-Variation.tsx
- src/shared/sections/cart/Cart-createView.tsx 88 ajouts, 73 suppressionssrc/shared/sections/cart/Cart-createView.tsx
- src/shared/sections/cart/UserCart/UserCart-list-view.tsx 56 ajouts, 154 suppressionssrc/shared/sections/cart/UserCart/UserCart-list-view.tsx
- src/shared/sections/cart/UserCart/UserCart-table-filters-result.tsx 6 ajouts, 25 suppressions.../sections/cart/UserCart/UserCart-table-filters-result.tsx
- src/shared/sections/cart/UserCart/UserCart-table-row.tsx 31 ajouts, 53 suppressionssrc/shared/sections/cart/UserCart/UserCart-table-row.tsx
- src/shared/sections/cart/UserCart/UserCart-table-toolbar.tsx 8 ajouts, 44 suppressionssrc/shared/sections/cart/UserCart/UserCart-table-toolbar.tsx
- src/shared/sections/cart/all-NewUsers/All-NewUsers-view.tsx 2 ajouts, 2 suppressionssrc/shared/sections/cart/all-NewUsers/All-NewUsers-view.tsx
- src/shared/sections/cart/all-NewUsers/NewUser-table-row.tsx 69 ajouts, 31 suppressionssrc/shared/sections/cart/all-NewUsers/NewUser-table-row.tsx
- src/shared/sections/cart/all-Orders/Order-table-filters-result.tsx 1 ajout, 1 suppression...d/sections/cart/all-Orders/Order-table-filters-result.tsx
- src/shared/sections/cart/all-Orders/Order-table-row.tsx 1 ajout, 1 suppressionsrc/shared/sections/cart/all-Orders/Order-table-row.tsx
- src/shared/sections/cart/all-Orders/Order-table-toolbar.tsx 1 ajout, 1 suppressionsrc/shared/sections/cart/all-Orders/Order-table-toolbar.tsx
Veuillez vous inscrire ou vous se connecter pour commenter