 merdan
|
159b0cfaa6
|
balance
|
2022-12-21 20:39:12 +05:00 |
|
merdan
|
c40eb25137
|
Merge branch 'master' of https://github.com/bagisto/bagisto into balance
Conflicts:
composer.lock
packages/Webkul/Admin/src/Resources/lang/ben/app.php
packages/Webkul/Admin/src/Resources/lang/ru/app.php
packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
packages/Webkul/Core/src/Core.php
packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
packages/Webkul/Product/src/Helpers/AbstractProduct.php
packages/Webkul/Product/src/Helpers/Toolbar.php
packages/Webkul/Product/src/Models/ProductFlat.php
packages/Webkul/Shipping/src/Config/system.php
packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
packages/Webkul/Tax/src/Http/Controllers/TaxController.php
packages/Webkul/Ui/src/Resources/lang/ben/app.php
|
2022-12-15 16:39:57 +05:00 |
|
merdan
|
bf1649de2f
|
balance
|
2022-12-15 15:58:03 +05:00 |
|
merdan
|
95d8459f24
|
snowfall
|
2022-12-15 15:13:37 +05:00 |
|
merdan
|
de2b1bf8ef
|
snowfall
|
2022-12-15 15:11:55 +05:00 |
|
merdan
|
999a7c8049
|
snowfall
|
2022-12-15 11:58:39 +05:00 |
|
merdan
|
ac7f36312b
|
lokale
|
2022-12-15 11:46:54 +05:00 |
Jitendra Singh
|
a089506f08
|
Merge pull request #7167 from prabhatkumaroc082/fix-booking-date-ui
Issue Fixed #6991
|
2022-12-14 19:29:34 +05:30 |
prabhat gautam
|
ad8d19ddee
|
resolved conflict
|
2022-12-13 19:12:56 +05:30 |
|
Jitendra Singh
|
09d23d6ecf
|
Merge pull request #7188 from AmooAti/dashboard_performance
Performance - Dashboard Controller
|
2022-12-12 16:14:46 +05:30 |
adhamiamirhossein
|
4dcaff4b7a
|
better dashboard performance
|
2022-12-11 12:46:13 +03:30 |
|
Jitendra Singh
|
c11cc7f857
|
Merge pull request #7077 from Sanjaybhattwebkul/darkMode-ui-issue
Issue #7072 Fixed
|
2022-12-09 13:07:43 +05:30 |
|
Jitendra Singh
|
0fafcbf8c1
|
Merge pull request #7183 from Sanjaybhattwebkul/admin-translation-issue
Translation issue fix for admin
|
2022-12-09 13:05:09 +05:30 |
|
Jitendra Singh
|
b4dcfd23f5
|
Merge pull request #7184 from Sanjaybhattwebkul/patch-5
Update app.php file
|
2022-12-09 13:04:45 +05:30 |
sanjay bhatt
|
0c53acc617
|
Conflicts resolved
|
2022-12-09 12:17:44 +05:30 |
|
sanjay bhatt
|
2bda77e1eb
|
Update app.php file
|
2022-12-08 13:39:05 +05:30 |
|
sanjay bhatt
|
a1bd853f16
|
Update for meta deta
|
2022-12-08 12:35:39 +05:30 |
|
sanjay bhatt
|
eefc798694
|
Translation issue fix for admin
|
2022-12-08 12:29:00 +05:30 |
|
merdan
|
5a4b54dd5d
|
lokale
|
2022-12-06 15:55:08 +05:00 |
|
merdan
|
4c9a7f1043
|
lokale
|
2022-12-06 15:45:50 +05:00 |
|
merdan
|
5a5056b9c2
|
delete lishniy +mobile link
|
2022-12-06 15:07:40 +05:00 |
|
merdan
|
aeec447c21
|
delete lishniy +mobile link
|
2022-12-06 15:05:24 +05:00 |
|
merdan
|
0fac91cbb0
|
delete lishniy +mobile link
|
2022-12-06 14:56:17 +05:00 |
|
merdan
|
cd5b12d606
|
delete lishniy +mobile link
|
2022-12-06 12:56:12 +05:00 |
|
prabhat gautam
|
af34119035
|
ui change of event ticket
|
2022-12-05 21:03:34 +05:30 |
|
merdan
|
ef4781c57d
|
discounted products
|
2022-12-05 16:28:13 +05:00 |
|
prabhat gautam
|
9334945311
|
Merge branch 'master' of https://github.com/bagisto/bagisto into fix-booking-date-ui
|
2022-12-05 16:53:40 +05:30 |
|
merdan
|
02209e58be
|
balance start
|
2022-12-05 16:17:37 +05:00 |
|
merdan
|
d380df4cbb
|
balance start
|
2022-12-05 16:17:22 +05:00 |
|
Jitendra Singh
|
5325e3fd0a
|
Merge pull request #7165 from prabhatkumaroc082/fix-cart-count
Issue fixed #7160
|
2022-12-02 12:58:44 +05:30 |
|
Jitendra Singh
|
887bbd4f20
|
Merge pull request #7138 from papnoisanjeev/product-view-disable-checks-on-routes
Issue Fixed [#7137]
|
2022-12-02 12:56:36 +05:30 |
|
prabhat gautam
|
1f5314bfcd
|
responsive slot
|
2022-12-01 15:35:11 +05:30 |
|
prabhat gautam
|
f08eee52fe
|
formatted code
|
2022-11-30 18:01:34 +05:30 |
|
prabhat gautam
|
c49e2da4bb
|
updated cart count as per product qty
|
2022-11-30 17:55:50 +05:30 |
|
Jitendra Singh
|
eb77f928e9
|
Merge pull request #7147 from akhtarkhan1/option-button-for-bundle-product
Issue Fixed #7080
|
2022-11-30 14:26:51 +05:30 |
|
Jitendra Singh
|
670601b913
|
Merge pull request #7155 from papnoisanjeev/issue-7154
Fixed Issue [#7154]
|
2022-11-29 15:41:08 +05:30 |
sanjeev
|
ab1b2537ca
|
updated conditional statement structure
|
2022-11-29 13:53:45 +05:30 |
|
sanjeev
|
b91955b23d
|
404 page redirection for comparisan
|
2022-11-29 13:42:25 +05:30 |
|
sanjeev
|
1bcf9fd185
|
condition update
|
2022-11-29 13:33:31 +05:30 |
|
sanjeev
|
d62c57fcb7
|
added 404 redirection
|
2022-11-29 11:39:03 +05:30 |
|
sanjeev
|
4adb736114
|
Fixed Issue [#7154]
|
2022-11-29 11:04:46 +05:30 |
|
Jitendra Singh
|
b8e3e45624
|
Merge pull request #6768 from akathuria289/multiple_request
Multiple requests
|
2022-11-28 17:57:34 +05:30 |
Abhishek Kathuria
|
9673c2a80b
|
resolved conflict
|
2022-11-28 17:50:30 +05:30 |
Akhtar Khan
|
ed21656c71
|
Conflicts resolved
|
2022-11-28 17:42:43 +05:30 |
|
Jitendra Singh
|
067de38f9e
|
Merge pull request #7146 from devansh-webkul/issues/6953
Fixed For Configurable And Grouped Product #6953
|
2022-11-28 16:59:03 +05:30 |
|
Jitendra Singh
|
72e5b4f67f
|
Merge pull request #7140 from gh-darvishani/features-login-as-customer
feature : add login as customer to admin customer grid
|
2022-11-28 16:58:10 +05:30 |
|
Jitendra Singh
|
24e5c76d48
|
Merge pull request #7145 from devansh-webkul/issues/6771
Fixed URL Issue #6771
|
2022-11-28 16:55:31 +05:30 |
|
Jitendra Singh
|
ff6cad1714
|
Merge pull request #7143 from prabhatkumaroc082/fix-calendar
Issue Fixed #7142
|
2022-11-28 16:54:49 +05:30 |
|
Jitendra Singh
|
a40f6f8f0d
|
Merge pull request #6876 from papnoisanjeev/invoice-design-updates
Invoice design updates #6838
|
2022-11-28 16:53:46 +05:30 |
|
Jitendra Singh
|
2b8fea91e8
|
Merge pull request #7141 from shagun2405/comparison_design_issue
Issue #6972 fixed
|
2022-11-28 16:52:13 +05:30 |