resolve all the conflict
Affichage de
- .env 2 ajouts, 1 suppression.env
- package-lock.json 13 ajouts, 13 suppressionspackage-lock.json
- package.json 1 ajout, 1 suppressionpackage.json
- src/app/dashboard/giftcard/giftcardactivity/[id]/page.tsx 1 ajout, 1 suppressionsrc/app/dashboard/giftcard/giftcardactivity/[id]/page.tsx
- src/app/dashboard/promo/[id]/edit/page.tsx 2 ajouts, 1 suppressionsrc/app/dashboard/promo/[id]/edit/page.tsx
- src/app/dashboard/promo/duplicate/[id]/page.tsx 0 ajout, 13 suppressionssrc/app/dashboard/promo/duplicate/[id]/page.tsx
- src/config-global.ts 2 ajouts, 0 suppressionsrc/config-global.ts
- src/contexts/types/giftcard.ts 2 ajouts, 2 suppressionssrc/contexts/types/giftcard.ts
- src/contexts/types/product.ts 48 ajouts, 0 suppressionsrc/contexts/types/product.ts
- src/contexts/types/promo.ts 12 ajouts, 9 suppressionssrc/contexts/types/promo.ts
- src/routes/paths.ts 1 ajout, 1 suppressionsrc/routes/paths.ts
- src/shared/_mock/_giftcard.ts 4 ajouts, 5 suppressionssrc/shared/_mock/_giftcard.ts
- src/shared/_mock/_promo.ts 24 ajouts, 24 suppressionssrc/shared/_mock/_promo.ts
- src/shared/api/addons-server.ts 52 ajouts, 0 suppressionsrc/shared/api/addons-server.ts
- src/shared/api/giftcard.ts 46 ajouts, 10 suppressionssrc/shared/api/giftcard.ts
- src/shared/api/promo.ts 39 ajouts, 45 suppressionssrc/shared/api/promo.ts
- src/shared/api/server.ts 1 ajout, 0 suppressionsrc/shared/api/server.ts
- src/shared/sections/giftcard/add-giftcard/addgiftcard.tsx 79 ajouts, 65 suppressionssrc/shared/sections/giftcard/add-giftcard/addgiftcard.tsx
- src/shared/sections/giftcard/allgiftcard/Giftedcard-list-view.tsx 110 ajouts, 48 suppressions...ed/sections/giftcard/allgiftcard/Giftedcard-list-view.tsx
- src/shared/sections/giftcard/allgiftcard/Giftedcard-table-row.tsx 6 ajouts, 7 suppressions...ed/sections/giftcard/allgiftcard/Giftedcard-table-row.tsx
Veuillez vous inscrire ou vous se connecter pour commenter