merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,955 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

1805 Commits

Author SHA1 Message Date
merdan 690a33710f Merge branch 'master' of https://github.com/bagisto/bagisto into dev 
 Conflicts:
	.env.example
	README.md
	composer.json
	composer.lock
	config/app.php
	config/scout.php
	packages/Webkul/API/Http/Controllers/Shop/AddressController.php
	packages/Webkul/API/Http/Resources/Checkout/Cart.php
	packages/Webkul/API/Http/Resources/Sales/Order.php
	packages/Webkul/API/Http/routes.php
	packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php
	packages/Webkul/Core/src/Resources/lang/fa/validation.php
	packages/Webkul/Core/src/Resources/lang/it/app.php
	packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
	packages/Webkul/Core/src/Resources/lang/tr/app.php
	packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php
	packages/Webkul/Velocity/publishable/assets/js/components.js
	packages/Webkul/Velocity/publishable/assets/js/manifest.js
	public/installer/Classes/Requirement.php
 2022-02-01 15:01:06 +05:00
Devansh 63b694a673 Squashed Commits 2022-01-31 12:14:02 +05:30
Devansh 39836f9a7b Some Cleanup Done 2022-01-28 16:25:34 +05:30
Devansh e09e9f2845 Layered Navigation Without Category 2022-01-28 16:14:07 +05:30
Deepak Singh Gusain 1aa67104cc resolve conflicts and merge master 2022-01-25 13:57:27 +05:30
Devansh 0fe5b20bda
Merge pull request #5675 from akhtarkhan1/product-download 
–Fixed Download product issue #5663
 2022-01-25 13:29:57 +05:30
Deepak Singh Gusain ad1f1f5b26 Fixed ui issue of checkout biling addres 2022-01-25 12:55:13 +05:30
Deepak Singh Gusain c14ed6c012 Fixed camera icon mobile view at bliss theme 2022-01-25 11:43:30 +05:30
Deepak Singh Gusain ac6998538f resolve conflicts and merge master 2022-01-25 10:24:58 +05:30
Deepak Singh Gusain 72c7ac0f7a remove conflicts and merge master 2022-01-24 19:12:44 +05:30
Deepak Singh Gusain 1ed64d231a Search Bar image issue 2022-01-24 13:09:04 +05:30
Deepak Singh Gusain 252aedd3e3 fixed ui of search result product card ui at bliss theme 2022-01-21 18:51:23 +05:30
Deepak Singh Gusain abdf9377ac Review Alignment issue at bliss theme 2022-01-21 16:16:07 +05:30
Akhtar Khan abcc1f1aad –Fixed Download product issue #5663 2022-01-21 16:15:39 +05:30
Deepak Singh Gusain e54d02017e fixed conflicts 2022-01-21 14:15:56 +05:30
Deepak Singh Gusain 27c7e6620e Fixed ui issue of order view at bliss theme 2022-01-21 14:09:53 +05:30
Deepak Singh Gusain 8e1605a914 remove space' 2022-01-20 19:58:34 +05:30
Deepak Singh Gusain f34c6ad854 Fixed alignment of delete button at customer profile page at bliss theme 2022-01-20 19:47:15 +05:30
Devansh 69eff9dbdd
Merge pull request #5660 from devansh-webkul/added-gender 
Select Gender Added #5531#issuecomment-1017148009
 2022-01-20 12:07:45 +05:30
Devansh a27872970d
Merge pull request #5653 from deepaksinghgusain227/velocity-datagrid 
Velocity datagrid
 2022-01-20 12:06:57 +05:30
Devansh 7f15ca3dc8 Select Gender Added 2022-01-20 11:39:16 +05:30
Devansh 41b0d284b9 Enhanced PDF 2022-01-19 23:36:04 +05:30
Devansh c89120cc4d Fixed Euro Currency Support 2022-01-19 20:43:28 +05:30
Deepak Singh Gusain b42bf8fa45 fixed datagrid issue at Velocity theme 2022-01-19 17:03:06 +05:30
Devansh 3f3e4816ea Doc Block Improved 2022-01-13 14:27:54 +05:30
Devansh 889a574bb8 Core Currency Method Improved 2022-01-13 13:41:18 +05:30
Devansh 13e1adcd25 Meaningfull Data :glasses: 2022-01-10 18:54:01 +05:30
Devansh f3902b94a3 Fixed With Proper Consistensy 2022-01-06 09:37:26 +05:30
Devansh 557a003cb8 Compare Issue Fixed 2022-01-04 11:26:22 +05:30
Devansh 7f3eb162b4 Merge branch 'master' into bagde-overlapping 2022-01-03 19:14:52 +05:30
Devansh 230d59af9c Added Bageds 2022-01-03 19:09:09 +05:30
Devansh be02fb9fd7 Auto Count fixed 2022-01-03 18:45:54 +05:30
Glenn Hermans 70c74e1233
Merge pull request #5495 from devansh-webkul/wishlist-issue 
Changes Done #5493
 2021-12-30 10:32:40 +01:00
Devansh 71001ad95c Changes Done 2021-12-30 14:50:52 +05:30
Devansh f229113022 Validation Added 2021-12-30 14:43:13 +05:30
Devansh d965a68b2d Default Theme Fixed 2021-12-29 18:56:36 +05:30
Devansh a1bda30db1 Changes Done 2021-12-29 18:25:35 +05:30
Glenn Hermans 70f6659619
Merge pull request #5479 from devansh-webkul/ui-issue 
UI Issue Fixed #5468
 2021-12-29 09:16:45 +01:00
Devansh 16ebd9c380 Changes Done 2021-12-29 13:26:13 +05:30
Devansh d303e1ac5d Cart Removed 2021-12-29 11:29:22 +05:30
merdiano cd690289dd merge from master 2021-12-28 07:58:20 +05:00
Devansh 9de56e11cc Fixed Wishlist Alert Issue 2021-12-27 13:53:15 +05:30
lovecoding-git a16016bb5f invoiceRepository, refundRepository @param include path fix 2021-12-17 10:25:03 -08:00
Devansh 2fa4a8d623 Default Quantity Changer Fixed 2021-12-17 13:48:24 +05:30
Devansh 67037a6049 Fixed In Default Theme Also 2021-12-17 12:08:09 +05:30
Devansh 8b6a1592e4 Moved Some Routes 2021-12-16 09:30:21 +05:30
Devansh 722d93ca5b Confliction Resolved 2021-12-13 13:13:56 +05:30
Devansh ffc6508e6e Message Added 2021-12-13 13:09:26 +05:30
Devansh bb53c23dee Added Confirm Box 2021-12-13 12:50:20 +05:30
Devansh 9688563b97
Merge pull request #5410 from Sanjaybhattwebkul/master 
Fixed issue #5409
 2021-12-13 10:58:56 +05:30