Commit Graph

206 Commits

Author SHA1 Message Date
morteza-mortezai 749ffca4b3 Merge pull request #40 from Danakcorp/mrtz
fix : returned and canncell status
2025-10-29 12:36:25 +03:30
morteza-mortezai 35ff18274e fix : returned and canncell status 2025-10-29 12:35:48 +03:30
morteza-mortezai fc2dbc79e3 Merge pull request #39 from Danakcorp/mrtz
fix : returned and cancelled status
2025-10-29 12:04:19 +03:30
morteza-mortezai e92dfd8784 fix : returned and cancelled status 2025-10-29 12:03:44 +03:30
morteza-mortezai 9c6cfcb8ea Merge pull request #38 from Danakcorp/mrtz
fix : returned and cancelled status orders
2025-10-29 11:36:58 +03:30
morteza-mortezai 49e3d51db8 fix : returned and cancelled status orders 2025-10-29 11:35:47 +03:30
morteza-mortezai 27d48a9071 Merge pull request #37 from Danakcorp/mrtz
test:keep cart after payment failure
2025-10-29 10:41:14 +03:30
morteza-mortezai 01822dc80f test:keep cart after payment failure 2025-10-29 10:40:32 +03:30
morteza-mortezai 41d06589d5 Merge pull request #36 from Danakcorp/mrtz
fix : sale report data
2025-10-29 10:18:05 +03:30
morteza-mortezai a559e28372 fix : sale report data 2025-10-29 10:16:54 +03:30
morteza-mortezai 56996fcee2 Merge pull request #35 from Danakcorp/mrtz
fix : order chart
2025-10-28 20:53:13 +03:30
morteza-mortezai 6c4d150006 fix : order chart 2025-10-28 20:52:10 +03:30
morteza-mortezai 25cf45d7b4 Merge pull request #34 from Danakcorp/mrtz
fix : cart total_discount
2025-10-28 17:27:37 +03:30
morteza-mortezai 76c0e6a83e fix : cart total_discount 2025-10-28 17:27:06 +03:30
morteza-mortezai 81cea0fa73 Merge pull request #33 from Danakcorp/mrtz
fix : cart error
2025-10-28 15:41:56 +03:30
morteza-mortezai 3e8f6a3ea5 fix : cart error 2025-10-28 15:40:41 +03:30
morteza-mortezai 76a45b8c31 Merge pull request #32 from Danakcorp/mrtz
fix : cart 500 err
2025-10-28 15:29:04 +03:30
morteza-mortezai 09ff829c36 fix : cart 500 err 2025-10-28 15:28:17 +03:30
morteza-mortezai f1646f70e7 Merge pull request #31 from Danakcorp/mrtz
fix : total discount
2025-10-28 15:17:54 +03:30
morteza-mortezai f0ccb5e025 fix : total discount 2025-10-28 15:16:29 +03:30
morteza-mortezai 6c5e0aeb5c Merge pull request #30 from Danakcorp/mrtz
add: shipment item to cart
2025-10-28 14:34:42 +03:30
morteza-mortezai 0672103465 add: shipment item to cart 2025-10-28 14:33:16 +03:30
morteza-mortezai 04e81e8d2c Merge pull request #29 from Danakcorp/mrtz
update : category update
2025-10-28 12:13:23 +03:30
morteza-mortezai 640ad6e91c update : category update 2025-10-28 12:11:37 +03:30
morteza-mortezai de05827458 Merge pull request #28 from Danakcorp/mrtz
Mrtz
2025-10-27 19:32:01 +03:30
morteza-mortezai afadc8179d update : update variant dto 2025-10-27 19:31:08 +03:30
morteza-mortezai a6e0908576 fix : callback url 2025-10-27 19:29:36 +03:30
morteza-mortezai 9a46b0f81a Merge pull request #27 from Danakcorp/mrtz
Mrtz
2025-10-27 11:45:25 +03:30
morteza-mortezai be74d75212 fix : admin shipment route 2025-10-27 11:44:21 +03:30
morteza-mortezai b8f0365ad6 fix : admin shipment route 2025-10-27 11:40:56 +03:30
morteza-mortezai c4a60ae813 add: update admin route added 2025-10-27 10:59:41 +03:30
morteza-mortezai 25b8d94377 Merge pull request #26 from Danakcorp/mrtz
Mrtz
2025-10-26 16:58:17 +03:30
morteza-mortezai 9af567c91a fix : min Product varient price decrased to 1000 2025-10-26 16:57:53 +03:30
morteza-mortezai e469a2eadd add: admin shop shipment 2025-10-26 16:50:17 +03:30
morteza-mortezai 107df91d28 Merge pull request #25 from Danakcorp/mrtz
Mrtz
2025-10-26 13:16:01 +03:30
morteza-mortezai 1e38c353f2 fix : in category page, send products that have at least on variant 2025-10-26 13:15:25 +03:30
morteza-mortezai b955f89be0 fix : bug create no color no size variant 2025-10-26 12:39:29 +03:30
morteza-mortezai cef0fe8aab Merge pull request #24 from Danakcorp/mrtz
Mrtz
2025-10-26 11:38:07 +03:30
morteza-mortezai 1ad879f930 fix : update product : approved 2025-10-26 11:32:45 +03:30
morteza-mortezai b06e89dfce fix : slide update display location 2025-10-26 10:45:59 +03:30
morteza-mortezai fd26e2b633 Merge pull request #23 from Danakcorp/mrtz
fix : delete category
2025-10-25 20:18:40 +03:30
morteza-mortezai 9b02d9fa07 fix : delete category 2025-10-25 20:18:02 +03:30
morteza-mortezai c7566b4621 Merge pull request #22 from Danakcorp/mrtz
Mrtz
2025-10-25 19:37:36 +03:30
morteza-mortezai 3053b57056 fix : create category variant 2025-10-25 19:36:36 +03:30
morteza-mortezai 3caa943a1b fix : remove required from hint in dto 2025-10-25 16:46:00 +03:30
morteza-mortezai 05d913b9a9 fix : remove unused 2025-10-25 16:39:06 +03:30
morteza-mortezai 0c589165c2 fix : put attibute value directl in product 2025-10-25 16:35:48 +03:30
morteza-mortezai 6f19c6c384 fix : category att valiue array can be 0 length 2025-10-25 15:57:55 +03:30
morteza-mortezai 5a7f4aec96 fix : user email default false 2025-10-25 12:28:10 +03:30
morteza-mortezai 9fdf9fdd49 Merge pull request #21 from Danakcorp/mrtz
fix : last step of creat product dor admin
2025-10-25 12:11:45 +03:30