Commit Graph

11761 Commits

Author SHA1 Message Date
merdan 7bb73ebef5 menus start 2022-09-03 18:02:41 +05:00
merdan 975a68f988 order total weight fx 2022-09-03 17:19:08 +05:00
merdan 206a7befe2 order total weight 2022-09-03 17:13:58 +05:00
merdan 34db696c08 order item count red 2022-09-03 17:02:26 +05:00
merdan a07f1f7170 order item count red 2022-09-03 16:58:30 +05:00
merdan 3c9bbbb392 menus & translations ready 2022-09-03 16:48:04 +05:00
merdan 6d4bee4e14 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	packages/Webkul/Category/src/Repositories/CategoryRepository.php
	packages/Webkul/Product/src/Listeners/ProductFlat.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
2022-09-03 15:51:08 +05:00
merdan 4b447bf6c5 order item kilogram price 2022-09-03 15:37:17 +05:00
merdan a518c1c783 wellknow ss 2022-09-01 15:15:15 +05:00
merdan e3a2cc3c12 wellknow ss 2022-09-01 15:10:22 +05:00
merdan 7a4bb61997 wellknow ss 2022-09-01 15:06:29 +05:00
merdan 93b8bbe8fa wellknow ss 2022-08-30 12:26:00 +05:00
merdan af04ac7782 wellknow ss 2022-08-30 12:21:06 +05:00
Jitendra Singh 521eb9b2d8
Merge pull request #6667 from jitendra-webkul/master
Updated changelog and version in env files
2022-08-30 11:21:32 +05:30
jitendra d6e8aa435a Updated readme and version in env files 2022-08-30 11:10:14 +05:30
jitendra 44c17ef8e4 Merge branch 'master' of https://github.com/bagisto/bagisto 2022-08-30 11:04:08 +05:30
jitendra cd594fae54 Fixed typo 2022-08-30 11:03:45 +05:30
Jitendra Singh 61c39e6dce
Merge pull request #6666 from Sanjaybhattwebkul/changeLogV1.4.4
ChangeLog Updated V1.4.4
2022-08-30 11:03:29 +05:30
Jitendra Singh 7386016d15
Merge pull request #6546 from papnoisanjeev/transaction-amt-issue
Transaction amount exceed issue fixed #6545
2022-08-30 10:32:13 +05:30
sanjay bhatt 9356777c1a Date correcttion 2022-08-30 10:16:17 +05:30
merdan b04e464aaf wellknow 2022-08-29 20:21:36 +05:00
merdan ff6e0c71c3 wellknow 2022-08-29 20:19:42 +05:00
merdan 75046e4e6b wellknow 2022-08-29 20:18:27 +05:00
sanjay bhatt a943ffd3a3 ChangeLog Updated V1.4.4 2022-08-29 19:45:51 +05:30
Jitendra Singh 7274a47a36
Merge pull request #6608 from papnoisanjeev/config-product-regular-price-show-issue
Showing discount to variant of config products for which catalog rule applied only.
2022-08-29 19:18:49 +05:30
Jitendra Singh 8bc8839cb6
Merge pull request #6665 from papnoisanjeev/multiple-same-address-save-issue
Checkbox disabled after address save one time #6312
2022-08-29 18:49:55 +05:30
sanjeev e2c76b4ca9 checkbox disabled after address save one time #6312 2022-08-29 18:28:42 +05:30
Jitendra Singh b48cadd585
Merge pull request #6664 from sashashura/patch-1
GitHub Workflows security hardening
2022-08-29 18:28:32 +05:30
Alex 170ee2f0cd
Update ci.yml
Signed-off-by: sashashura <93376818+sashashura@users.noreply.github.com>
2022-08-29 13:20:47 +01:00
Jitendra Singh 5b9ee57fe9
Merge pull request #6663 from SaraMohElsanan/patch-1
Fix ShowModal Call
2022-08-29 17:41:59 +05:30
Sara M. Elsanan 2b043f91ac
Fix ShowModal Call
Error: admin.js:2 ReferenceError: showModal is not defined
fix add Group in Edit family - it was missing $root
2022-08-29 14:01:28 +02:00
merdan ffbb7f5fd2 wellknow 2022-08-29 15:00:27 +05:00
sanjeev c84d296fdf recompiled 2022-08-29 12:22:55 +05:30
Jitendra Singh d273914769
Merge pull request #6604 from akathuria289/issue_6366
Fixed issue #6366
2022-08-29 11:18:48 +05:30
Jitendra Singh 2cbcb04b0e
Merge pull request #6656 from akathuria289/issue_6341
Fixed issue #6341
2022-08-29 11:18:10 +05:30
Jitendra Singh 1b7b78cbc2
Merge pull request #6658 from papnoisanjeev/slot-selection-issue-rental-booking-type-product
Slot duration selection message for one hour #6271
2022-08-29 11:17:40 +05:30
Jitendra Singh 555fd43383
Merge pull request #6659 from akathuria289/issue_6461
Fixed issue #6461
2022-08-29 11:17:01 +05:30
sanjeev 15a2266a83 Recompiled 2022-08-25 16:05:23 +05:30
sanjeev 26ef6973b0 Conditions added 2022-08-25 15:56:30 +05:30
Abhishek Kathuria ddf1d5a5f6 Fixed formatting 2022-08-25 15:53:35 +05:30
Abhishek Kathuria 1f55ecb374 Fixed issue #6481 2022-08-25 15:49:33 +05:30
sanjeev fbf9a699be space removed 2022-08-25 14:02:07 +05:30
sanjeev c5c1991e83 Restructure code 2022-08-25 13:18:39 +05:30
sanjeev 93c49b1fc7 Slot duration selection message for one hour. 2022-08-25 12:54:07 +05:30
Abhishek Kathuria 90348061a1 Fixed issue #6341 2022-08-24 17:30:16 +05:30
Abhishek Kathuria ba10d0a95f Resolved commit 2022-08-24 17:04:43 +05:30
Abhishek Kathuria 17678382ee Fixed issue 2022-08-24 17:03:18 +05:30
Abhishek Kathuria 1c1b303e54 Merge branch 'issue_6366' of github.com:akathuria289/bagisto into issue_6366 2022-08-24 17:00:21 +05:30
Jitendra Singh 596b9dcfc6
Merge pull request #6625 from papnoisanjeev/icons-issue-user-profile
Date and cross icon issue with customer profile.
2022-08-24 15:37:20 +05:30
sanjeev db2a5266a0 Update after into parent 2022-08-24 15:11:51 +05:30