8183 Commits

Author	SHA1	Message	Date
Glenn Hermans	17c5696532	Merge pull request #6525 from akathuria289/issue_fixed_#6458 ... Fixed issue #6458	2022-07-19 22:11:20 +02:00
Glenn Hermans	8e42cb47f9	Merge pull request #6568 from papnoisanjeev/percentage-discount-validation-cart-rule-catalog-rule ... Validation for percentage discount amt added.	2022-07-19 22:10:49 +02:00
Abhishek Kathuria	73d04b0fe3	Fixed issue #6359	2022-07-19 17:27:26 +05:30
sanjeev	92990047a9	updated default max value in case of filter not applied	2022-07-19 16:50:58 +05:30
Abhishek Kathuria	bcba17f0dc	Fixed issue #6386	2022-07-19 16:35:26 +05:30
Abhishek Kathuria	d8d57263e2	Changes done	2022-07-19 15:45:40 +05:30
Abhishek Kathuria	5d3f6745a4	Fixed issue #6371	2022-07-19 15:14:42 +05:30
Jitendra Singh	4306ea45a6	Merge pull request #6553 from jitendra-webkul/master ... Replace findOneByField function call with find	2022-07-19 13:29:17 +05:30
Seyed AmirHossein Adhami MirHosseini	89f8f277a7	lint - make variable camel case	2022-07-19 09:57:22 +04:30
Devansh	23d5326051	Update ConfigurationController.php	2022-07-19 10:46:13 +05:30
Seyed AmirHossein Adhami MirHosseini	74283f1aa2	bug fix - at least one shipping method must be enabled	2022-07-18 21:01:51 +04:30
sanjeev	2d31e6a13d	validation for percentage discount amt added	2022-07-18 18:22:34 +05:30
sanjeev	02a10298d7	Set default price to category max price value	2022-07-18 18:06:43 +05:30
Abhishek Kathuria	4834a3172b	Fixed issue	2022-07-18 17:19:16 +05:30
Abhishek Kathuria	28e9a3a5fe	Fixed spacing and added v-text	2022-07-18 12:04:29 +05:30
Abhishek	f7f39278c4	Fixed issue #6484	2022-07-17 15:49:21 +05:30
Glenn Hermans	ddc3b302ef	Merge pull request #6564 from papnoisanjeev/atleast-one-shipping-method ... At-least one shipping method should select #6370	2022-07-16 13:11:14 +02:00
sanjeev	88dc2a93ad	default selection price filter #6340	2022-07-15 15:33:55 +05:30
sanjeev	84c8a10ba9	alleast one shipping method should select #6370	2022-07-14 16:49:41 +05:30
sanjeev	df6809e676	Replaced ; from link	2022-07-14 11:38:20 +05:30
sanjeev	dc70f694b4	Wishlist sharing link issue resolved #6441	2022-07-14 10:57:38 +05:30
sanjeev	05ca3a554d	cart rule numeric validation for uses_per_coupon & uses_per_customer fields	2022-07-13 13:51:01 +05:30
sanjeev	818d56e80f	coupon status check before apply	2022-07-13 13:06:02 +05:30
jitendra	9fa2d73a06	Replace findOneByField function call with find	2022-07-12 18:30:59 +05:30
Jitendra Singh	3ab9f443e4	Merge pull request #6552 from jitendra-webkul/master ... Convert if else statement to PSR-2 standard	2022-07-12 17:46:50 +05:30
jitendra	e1a0c0b8c6	Convert if else statement to PSR-2 standard	2022-07-12 17:34:13 +05:30
Devansh	f66981a0c9	Update Cart.php	2022-07-12 16:17:19 +05:30
sanjeev	8e96b65fba	show warning in case coupon already applied	2022-07-12 14:52:13 +05:30
jitendra	f2df720bec	Changed else if to elseif (Followed PSR-2 standard)	2022-07-12 13:48:04 +05:30
jitendra	1b8e383461	Added variable caching in product flat listener	2022-07-12 13:19:25 +05:30
jitendra	0321dbb700	Resolved conflicts	2022-07-12 11:47:14 +05:30
jitendra	adf8c6e9eb	Remove unneccesarry functions from cart facades	2022-07-12 11:46:06 +05:30
jitendra	5deb1ddc76	Fixed duplicate query issue for cart	2022-07-12 11:18:58 +05:30
jitendra	8927614686	Fixed configurable child item issue in place order	2022-07-12 10:55:00 +05:30
jitendra	7e14ba1b1e	Removed commented code	2022-07-11 18:22:41 +05:30
jitendra	dbe690fe93	Fixed deactivate car issue	2022-07-11 18:15:58 +05:30
jitendra	e833fbca28	Removed unneccesary eager login	2022-07-11 18:05:12 +05:30
jitendra	5ca30fa664	Optimized cart	2022-07-11 17:51:33 +05:30
sanjeev	fde35a15ca	Updated Store Method	2022-07-11 17:27:18 +05:30
Glenn Hermans	6bc6131c2a	Merge pull request #6541 from papnoisanjeev/refund-redirection-update ... After refund, redirect to refund index page #6355	2022-07-11 10:52:08 +02:00
Glenn Hermans	b3fcde21d4	Merge pull request #6526 from TheIceMagmaCube/patch-1 ... Update French translations	2022-07-09 11:46:25 +02:00
Glenn Hermans	a8c671b186	Merge pull request #6515 from papnoisanjeev/category-product-search ... Redirection issue during product search from category edit page.	2022-07-09 11:44:28 +02:00
Glenn Hermans	67fb7cf453	Merge pull request #6516 from papnoisanjeev/product-deleted-exceptions ... Product deleted exceptions in case admin delete a product.	2022-07-09 11:43:24 +02:00
Glenn Hermans	c204e12a69	Merge pull request #6536 from papnoisanjeev/inactive-user-placing-orders ... Inactive user placing order issue fixed #6407	2022-07-09 11:42:26 +02:00
Glenn Hermans	716d37b3f5	Merge pull request #6531 from akathuria289/issue_fixed_#6426 ... Fixed issue #6426	2022-07-09 11:41:10 +02:00
Glenn Hermans	8d666f784b	Merge pull request #6535 from devansh-webkul/issues/6463 ... Fixed there should not be an exception if the admin is trying to add a new variant for the configurable product #6463	2022-07-09 11:40:34 +02:00
sanjeev	c67e316035	After refund, redirect to refund index page #6355	2022-07-08 17:01:40 +05:30
sanjeev	f6d2685807	update	2022-07-08 15:44:37 +05:30
sanjeev	8b3624e719	Inactive user place order issue fixed #6407	2022-07-08 11:35:40 +05:30
Devansh Bawari	f22499c7b0	Added Inside Creat Variant	2022-07-08 11:17:29 +05:30
Abhishek Kathuria	660a7ba711	Fixed issue #6428	2022-07-07 17:43:32 +05:30
jitendra	22f995475d	Cart optimization reverted	2022-07-07 17:35:53 +05:30
sanjeev	d72beab56e	error message in case user redirecting to review page of deleted product	2022-07-07 17:29:17 +05:30
jitendra	0fee916bf9	Merged	2022-07-07 17:20:10 +05:30
jitendra	a5a1111484	Product system performance optimization	2022-07-07 17:19:32 +05:30
Abhishek Kathuria	51634bd32f	FIxed issue #6458	2022-07-07 16:53:20 +05:30
Abhishek Kathuria	a409d579ca	Fixed issue #6426	2022-07-07 16:18:37 +05:30
sanjeev	11eadd3c9c	updates	2022-07-07 15:04:10 +05:30
sanjeev	6f0886299d	updates	2022-07-07 13:43:03 +05:30
Abhishek Kathuria	d7388a86bd	Fixed issue #6428	2022-07-07 12:26:58 +05:30
TheIceMagmaCube	748eaaec6f	Update French translations ... Just a bunch of translations updated. It's more fluent.	2022-07-06 19:19:03 +02:00
sanjeev	a8081c870c	updates	2022-07-06 19:14:52 +05:30
sanjeev	cb8e5a090b	updates	2022-07-06 19:04:17 +05:30
Abhishek Kathuria	8c28fdd6df	Fixed issue #6458	2022-07-06 17:53:19 +05:30
sanjeev	add970dfbc	flash waring message added	2022-07-06 16:23:45 +05:30
sanjeev	009db6fb1f	Exception Fixed	2022-07-06 15:57:56 +05:30
sanjeev	b7a209295b	Mass Action Fixed	2022-07-06 15:54:20 +05:30
sanjeev	42b61b4610	Redirection issue during product search from category edit page	2022-07-05 11:34:00 +05:30
Glenn Hermans	97105dadb9	Merge pull request #6488 from Sanjaybhattwebkul/View-order-UI-issue ... Issue #6479 fixed	2022-07-02 17:30:00 +02:00
Glenn Hermans	41726ce34c	Merge pull request #6502 from der-On/patch-1 ... Uses rounding precision of 4 to store cart item prices	2022-07-01 23:32:41 +02:00
Glenn Hermans	0653cdfa11	Merge pull request #6491 from dseguy/refactor_counts ... refactored conditions with simpler terms	2022-06-30 05:18:19 +02:00
Sanjay	025b303c2e	Issue #6507 fixed	2022-06-24 11:35:43 +05:30
Sanjay	11c64144de	Issue #6505 fixed	2022-06-23 13:40:41 +05:30
Sanjay	54d17d8086	Issue #6444 fixed	2022-06-22 11:20:04 +05:30
der_On	e5ee965c88	Uses rounding precision of 4 to store cart item prices ... resolves #6501 This prevents rounding errors after applying taxes.	2022-06-21 17:57:59 +02:00
Sanjay	b5961ec1fe	Issue #6492 fixed	2022-06-20 11:47:33 +05:30
Glenn Hermans	5fb0f1d87b	Merge pull request #6495 from noxterr/language-translation-improvement ... Fix Italian translation	2022-06-18 16:12:36 +02:00
Glenn Hermans	2d51acd61e	Merge pull request #6477 from devansh-webkul/config-updated ... Config Added	2022-06-18 16:04:56 +02:00
noxter	1747c4ca01	Fix Italian translation ... Fixing some typos, adding some missing translation, correcting pre-existing translation that could have been misleading	2022-06-18 15:26:38 +02:00
Damien Seguy	a5db9db490	refactored conditions with simpler terms	2022-06-15 18:00:59 +02:00
Sanjay	ffa8db3e2e	Enhancement #6417 done	2022-06-14 16:46:22 +05:30
Sanjay	f39f78a985	Enhancement #6427 done	2022-06-14 16:18:48 +05:30
Sanjay	145de5bc1b	Issue #6479 fixed	2022-06-14 12:14:36 +05:30
Glenn Hermans	2790a6e1ff	Merge pull request #6470 from Sanjaybhattwebkul/admin-translation-issue ... Issue #6469 fixed	2022-06-12 15:26:06 +02:00
miladkian	2e03ac268c	Remove extra find query on update channel	2022-06-09 21:48:27 +04:30
Sanjay	add4be2ed9	Issue #6459-fixed-default-theme	2022-06-09 11:12:25 +05:30
Devansh	f812db03cd	Config Added	2022-06-08 16:21:46 +05:30
Jitendra Singh	f14b63d40a	Merge pull request #6431 from Sanjaybhattwebkul/cart-ui-issue ... Issue #6369 fixed	2022-06-08 14:53:33 +05:30
Jitendra Singh	dc834b0bde	Merge pull request #6460 from Sanjaybhattwebkul/delete-review-issue ... Issue #6459 fixed	2022-06-08 14:52:59 +05:30
Abdelrhman Gamal	6261e0f6a6	Merge branch 'bagisto:master' into master	2022-06-07 22:41:57 +02:00
Sanjay	13b0fd96a4	Issue #6369 fixed	2022-06-07 18:42:49 +05:30
Devansh	2aa1842262	Some Spacing Added	2022-06-07 18:18:51 +05:30
Sanjay	938da5f348	Changes complete	2022-06-06 11:02:30 +05:30
Sanjay	2b3fb6aff4	Issue #6469 fixed	2022-06-03 17:06:21 +05:30
Glenn Hermans	0f97448b55	Revert "Enhancement #6367 done"	2022-06-02 07:40:59 +02:00
Glenn Hermans	157b9f5f26	Merge pull request #6439 from Sanjaybhattwebkul/add-discount-precent ... Enhancement #6367 done	2022-06-01 20:24:47 +02:00
Glenn Hermans	29c659ba47	Merge pull request #6455 from Sanjaybhattwebkul/compare-page-ui-issue ... Issue #6443 fixed	2022-05-31 12:53:07 +02:00
Glenn Hermans	9904176e46	Merge pull request #6433 from Sanjaybhattwebkul/copy-link-message ... Enhancement #6273 done	2022-05-31 12:52:39 +02:00
Sanjay	067e9724a7	Translation-added-for-confirm-message	2022-05-31 15:24:33 +05:30
Sanjay	6290a167bb	Issue #6459 fixed	2022-05-31 15:12:54 +05:30
Glenn Hermans	362a3edccd	Merge pull request #6456 from Sanjaybhattwebkul/compare-product-alignment ... Issue #6442 fixed	2022-05-31 01:18:05 +02:00
Glenn Hermans	0452b7e1c2	Merge pull request #6432 from Sanjaybhattwebkul/admin-sidebar-ui-issue ... Issue #6425 fixed	2022-05-31 01:17:07 +02:00
Sanjay	92701100f6	Issue #6442 fixed	2022-05-30 16:58:57 +05:30
Sanjay	6964c74c25	Issue #6443 fixed	2022-05-30 13:44:15 +05:30
Sanjay	43bb42149b	Issue #6452 Fixed	2022-05-30 11:22:18 +05:30
Abdelrhman Gamal	87dc1c1284	Optimze Get Gategory Product Attribute function , Specially for large number for product.	2022-05-26 11:07:23 +02:00
Sanjay	0ae38cda7d	Merge branch 'copy-link-message' of https://github.com/Sanjaybhattwebkul/bagisto into copy-link-message	2022-05-24 12:04:48 +05:30
Sanjay	e4a09e6915	shareLink-copy-message-added-default-theme	2022-05-24 12:03:55 +05:30
Sanjay	70d34671ee	Issue #6385 fixed	2022-05-23 15:56:42 +05:30
Sanjaybhattwebkul	cb95a43b3b	Update price.blade.php	2022-05-23 12:52:13 +05:30
Sanjay	3a23603659	Enhancement #6367 done	2022-05-23 12:48:20 +05:30
Sanjay	3fece7e7c0	Changes complete	2022-05-23 11:19:42 +05:30
Glenn Hermans	63ee4b6774	Merge pull request #6438 from bagisto-europe/6419 ... fixed #6430	2022-05-21 13:03:48 +02:00
Glenn Hermans	4d19aa72d6	fixed #6430	2022-05-21 12:55:48 +02:00
Sanjay	255478ad26	Issue #6434 fixed	2022-05-20 12:07:05 +05:30
Sanjay	24d5d8b6dc	Do-come-changes	2022-05-19 16:25:32 +05:30
Sanjay	7470ea71cf	Issue #Enhancement #6273 done	2022-05-19 14:43:47 +05:30
Sanjay	4284558cf3	Issue #6425 fixed	2022-05-19 12:25:57 +05:30
Jitendra Singh	da67547399	Merge pull request #6424 from Sanjaybhattwebkul/order-status-issue ... Issue #6423 fixed	2022-05-17 14:44:49 +05:30
Jitendra Singh	1feb45c3d6	Merge pull request #6420 from devansh-webkul/footer-removed ... Removed Footer Link From Velocity Theme	2022-05-17 13:28:57 +05:30
Sanjay	917fbca55d	Issue #6423 fixed	2022-05-17 11:05:02 +05:30
Glenn Hermans	766896a3c9	Merge pull request #6398 from Sanjaybhattwebkul/cms-preview-option ... Issue #6357 fixed	2022-05-17 00:29:46 +02:00
Glenn Hermans	6fee0cc477	fixed #6419	2022-05-16 21:09:26 +02:00
Devansh	1db613d9cd	Removed Footer Link From Velocity Theme	2022-05-16 17:13:36 +05:30
Jitendra Singh	41e5842612	Merge pull request #6414 from devansh-webkul/calender-issue-on-customer-account ... Calender Icon On Customer Account Fixed #6332	2022-05-16 13:47:41 +05:30
Devansh	f394b16993	Group Checked Added	2022-05-12 09:43:46 +05:30
Devansh	246f7bca46	Calender Icon On Customer Account Fixed	2022-05-09 20:25:20 +05:30
Devansh	acadccebe0	Update CMSPageDataGrid.php	2022-05-09 17:17:08 +05:30
Devansh	dd5a344a96	Integer Validation Added	2022-05-09 17:08:56 +05:30
Devansh	0e5829cb6a	Multiple Issue Fixed	2022-05-09 16:53:16 +05:30
Devansh	0af35cae62	Merge branch 'master' into validation-message-added	2022-05-09 16:40:41 +05:30
Jitendra Singh	d13444fd08	Merge pull request #6410 from devansh-webkul/country-data ... API Route Updated #6333	2022-05-09 16:35:51 +05:30
Devansh	203e5bb9b0	Select Country Added	2022-05-09 16:21:22 +05:30
Jitendra Singh	5676dd2116	Merge pull request #6391 from devansh-webkul/shipping-issue ... Shipping File Updated #6277	2022-05-09 16:19:40 +05:30
Devansh	f74b6b0b92	Validations message Added	2022-05-09 16:05:21 +05:30
Devansh	b18b3cc21b	API Route Updated	2022-05-09 13:39:49 +05:30
Devansh	77c8999194	Alignment Fixed	2022-05-09 13:22:27 +05:30
Sanjay	ed8d56749b	Changes-complete	2022-05-09 12:56:12 +05:30
Jitendra Singh	fab1fbf18c	Merge pull request #6387 from devansh-webkul/carousel-width ... Carousel Width Updated #6276	2022-05-09 10:37:27 +05:30
Glenn Hermans	5708cd2183	Merge pull request #6405 from devansh-webkul/paypal-issue ... Common Message Added #6313	2022-05-06 11:39:58 +02:00
Jitendra Singh	bb32619ad4	Merge pull request #6403 from devansh-webkul/wishlist-and-compare ... Wishlist And Compare Added #6401	2022-05-06 13:37:06 +05:30
Devansh	60994928b7	Default Theme Fixed	2022-05-06 13:09:00 +05:30
Devansh	b6cf328722	Common Message Added	2022-05-06 13:03:50 +05:30
Devansh	5706671445	Fixed Address Delete Issue	2022-05-06 12:54:09 +05:30
Devansh	4764c75305	Wishlist And Compare Added	2022-05-06 12:40:47 +05:30
Jitendra Singh	88d00cce5b	Merge pull request #6392 from devansh-webkul/validation ... Updated Validation	2022-05-06 10:32:12 +05:30
Devansh	e7fe7e8ba4	Fixed 360 And 460 PX	2022-05-06 09:58:08 +05:30
Devansh	c52bcb430c	Fixed Exception In Merged Cart	2022-05-05 16:52:45 +05:30
Sanjay	aedd5127cb	Issue #6357 fixed	2022-05-05 16:32:33 +05:30
Devansh	e342cfd480	Width Fixed	2022-05-04 21:05:27 +05:30
Devansh	9b03696cba	Updated Validation	2022-05-04 20:15:10 +05:30
Devansh	a93c4945fb	Shipping File Updated	2022-05-04 18:30:45 +05:30
Devansh	b44af2353d	Carousel Width Updated	2022-05-04 15:19:57 +05:30
Devansh	4e1edf35b8	Delete Overlap Issue Fixed	2022-05-02 13:24:10 +05:30
Devansh	d8fb5bdabb	Merge remote-tracking branch 'upstream/master' into delete-overlap-issue	2022-05-02 13:10:47 +05:30
Devansh	b9e5df9a47	Delete Overlap Issue Fixed	2022-05-02 13:00:28 +05:30
Devansh	d635930778	Added Anchor Tag On Default theme	2022-05-02 12:21:40 +05:30
Jitendra Singh	4ee71c0706	Merge pull request #6376 from devansh-webkul/removed ... Removed Dependency And Traces	2022-05-02 11:37:12 +05:30
Glenn Hermans	1288530a47	Merge pull request #6363 from Sanjaybhattwebkul/wishlist-share-buttons-ui ... Issue #6362 fixed	2022-04-29 22:33:31 +02:00
Sanjay	dfb8e55ea8	changes done	2022-04-29 18:02:17 +05:30
Sanjay	1c2677cd9e	Inline css remoed className used	2022-04-29 17:58:08 +05:30
Devansh	25deedb369	Removed Traces	2022-04-29 16:00:39 +05:30
Devansh	cc9641ea5b	Dependency Added	2022-04-29 15:37:03 +05:30
Devansh	154932be82	Query String Improved	2022-04-29 11:25:34 +05:30
Sanjay	d211c13ca6	Issue #6362 fixed	2022-04-27 12:11:47 +05:30
Devansh	a67ae8cd9b	Update view.blade.php	2022-04-26 17:01:51 +05:30
Devansh	95e4c74b57	More Checks Added	2022-04-26 14:48:42 +05:30
Devansh	fc836ee656	Merge remote-tracking branch 'upstream/master' into check-added	2022-04-26 13:51:47 +05:30
Devansh	3d51fc2db3	Check Added	2022-04-26 13:51:27 +05:30
Sanjay	04b15ab4fa	Enhancement #6327 Done	2022-04-26 11:54:43 +05:30
Sanjay	be967ad5c3	Issue #6346 fixed	2022-04-25 16:46:33 +05:30
Sanjay	936f07a6c7	Issue #6342 fixed	2022-04-25 13:17:01 +05:30
Jitendra Singh	43a0f6826f	Merge pull request #6336 from Sanjaybhattwebkul/ar-translation ... Issue #6335 fixed	2022-04-22 11:13:30 +05:30
Sanjay	0df4af23e9	Issue #6335 fixed	2022-04-22 10:56:39 +05:30
Jitendra Singh	1261669caa	Merge pull request #6325 from Sanjaybhattwebkul/account-message-issue ... Issue #6324 Fixed	2022-04-21 14:49:56 +05:30
Devansh	0e221815c8	Calender Icon Fixed	2022-04-20 18:34:09 +05:30
Sanjay	6b74b2644b	Issue #6324 Fixed	2022-04-20 17:14:29 +05:30
Devansh	0a233187ac	Added Dev Version	2022-04-20 16:10:08 +05:30
Devansh	8df3c37d01	Version Updated	2022-04-20 15:47:14 +05:30
Jitendra Singh	c34fba9443	Merge pull request #5959 from Sanjaybhattwebkul/remove-compare-option ... Remove-compare-option-from-wishlist	2022-04-20 15:17:54 +05:30
Jitendra Singh	af7ea4d8c8	Merge pull request #5998 from ILDaviz/delete-all-item-cart ... Remove all cart items at once	2022-04-20 13:51:36 +05:30
Devansh	ff7788acc7	Mapping Added	2022-04-20 12:46:26 +05:30
Devansh	b865e5dcb2	Fixed RTL Issue	2022-04-19 19:49:51 +05:30
Devansh	9bee6a904a	Added Key	2022-04-19 18:07:31 +05:30
Devansh	231a794e64	Some Border Finishing Done	2022-04-19 17:47:20 +05:30
Devansh	910de2376a	Added In Velocty Theme Also And Some Refinement Done	2022-04-19 17:25:22 +05:30
Devansh	713e3a325b	Dropdown Width And Word Wrap Fixed	2022-04-19 16:29:41 +05:30
Devansh	97d97a1521	On Enter Event Added	2022-04-19 16:11:18 +05:30
Devansh	4b161319e9	Refactored Front Component	2022-04-19 15:32:15 +05:30
Devansh	7b814829fd	Some Refactoring Done And Used Match Expressions	2022-04-19 14:15:29 +05:30
David Galet	86bccf82f7	♻️ Change method route type get to post	2022-04-19 10:38:50 +02:00
Devansh	1b5d311044	Checkbox Support Added	2022-04-19 12:53:57 +05:30
Devansh	4138d0d1ca	Added Unit Test	2022-04-18 19:37:56 +05:30
Devansh	56504d9fb9	Ship Quantity Added And Then Deducted	2022-04-18 18:14:29 +05:30
Vivek Sharma	6f784bc935	[Updated: field-type: info index updated for configuration.]	2022-04-18 16:05:57 +05:30
Devansh	b5845741cf	Removed Space In RTL	2022-04-18 15:12:53 +05:30
Devansh	858be214d0	Removed Vue Loader	2022-04-18 14:27:15 +05:30
Devansh	1e742894b3	Added Cursor Pointer	2022-04-18 13:34:44 +05:30
Sanjay	7e5711bf47	Changes-complete	2022-04-14 12:44:13 +05:30
Sanjay	f20e8b6524	Recompiled	2022-04-14 12:22:25 +05:30
Sanjay	d466beadcd	Resolved Conflict	2022-04-14 12:21:33 +05:30
Jitendra Singh	1ffcd7dcc1	Merge pull request #6298 from Sanjaybhattwebkul/order-datagrid-ui-issue ... Issue #6261 fixed	2022-04-14 12:10:40 +05:30
Sanjay	bb6c2b0c4c	Issue #6260 fixed	2022-04-14 12:02:28 +05:30
Sanjay	a8b4320d85	Issue #6261 fixed	2022-04-14 11:17:53 +05:30
Jitendra Singh	84008b659a	Merge pull request #6296 from devansh-webkul/duplicate-query-removed ... Duplicate Calls Removed	2022-04-13 17:01:55 +05:30
Devansh	eae1c6b7f4	Duplicate Query Removed	2022-04-13 16:46:33 +05:30
Sanjay	bc51e1b6dc	Issue #6294 fixed	2022-04-13 11:54:45 +05:30
Jitendra Singh	e9001d924e	Merge pull request #6286 from Sanjaybhattwebkul/dashboard-cards ... Issue #6285 fixed	2022-04-12 16:48:38 +05:30
Sanjay	fb078025aa	Issue #6278 Fixed	2022-04-12 15:43:11 +05:30
Sanjay	aaf523c47e	Issue #6259 fixed	2022-04-12 11:38:09 +05:30
Jitendra Singh	a0cec34e26	Merge pull request #6272 from vivek-webkul/patch-51 ... [Updated: locale added for the passwords.throttled.]	2022-04-11 17:43:17 +05:30
Jitendra Singh	babd17b07c	Merge pull request #6284 from Sanjaybhattwebkul/mini-cart-ui-issue ... Issue #6283 fixed	2022-04-11 17:34:59 +05:30
Jitendra Singh	cfd2821a8a	Merge pull request #6282 from Sanjaybhattwebkul/share-wishlist-translation ... Complete-missing-translation-for-wishlistShare	2022-04-11 17:34:03 +05:30
Sanjay	18757e7479	Issue #6285 fixed	2022-04-11 16:47:34 +05:30
Sanjay	c458d9332a	Issue #6283 fixed	2022-04-11 16:00:02 +05:30
Sanjay	74c2b1f462	Complete-missing-translation-for-wishlistShare	2022-04-11 13:27:37 +05:30
Sanjay	bbdac0a50e	Issue #6279 fixed	2022-04-11 12:56:06 +05:30
Vivek Sharma	83390632da	[Updated: locale added for the passwords.throttled.]	2022-04-08 12:51:58 +05:30
Jitendra Singh	8dc456c034	Merge pull request #6268 from jitendra-webkul/master ... Issue #6267 fixed	2022-04-07 19:06:28 +05:30
jitendra	5dc3e61c08	Issue #6267 fixed	2022-04-07 17:56:01 +05:30
Jitendra Singh	8a6bd3aa1c	Merge pull request #6262 from devansh-webkul/admin-localization-removed ... Admin Localization Removed #4257#issuecomment-1090344313	2022-04-07 17:17:37 +05:30
Jitendra Singh	d377d9ec1b	Merge pull request #6265 from jitendra-webkul/master ... Issue #2308 fixed (Now attribute group's name can be changed)	2022-04-07 17:06:27 +05:30
jitendra	d257aa9720	Issue #2308 fixed	2022-04-07 16:56:33 +05:30
Devansh	1f15838622	Changes Done	2022-04-07 16:44:20 +05:30
Devansh	df1eea2a91	Admin Localization Removed	2022-04-07 12:28:23 +05:30
Jitendra Singh	4cf8476016	Merge pull request #6254 from jitendra-webkul/master ... Issue #6253 fixed	2022-04-06 17:31:20 +05:30
jitendra	173cff6e6e	Issue #6253 fixed	2022-04-06 17:22:59 +05:30
Jitendra Singh	def1d31b1f	Merge pull request #6252 from jitendra-webkul/master ... Issue #6250 fixed	2022-04-06 17:01:44 +05:30
jitendra	2b2b9d10ec	Issue #6250 fixed	2022-04-06 16:50:16 +05:30
Jitendra Singh	5d4bb0f335	Merge pull request #6251 from jitendra-webkul/master ... Issue #2718 fixed	2022-04-06 16:32:42 +05:30
jitendra	4d44b844f4	Issue #2718 fixed	2022-04-06 16:24:27 +05:30
Jitendra Singh	0921789cb8	Merge pull request #6249 from jitendra-webkul/master ... Issue #5354 fixed	2022-04-06 15:29:28 +05:30
jitendra	93f582b78f	Issue #5354 fixed	2022-04-06 15:05:39 +05:30
Jitendra Singh	0c5cb7ed82	Merge pull request #6245 from devansh-webkul/currency-symbol-and-product-listing-issue ... Currency Symbol #6244 And Product Listing Fixed #6246	2022-04-06 14:58:01 +05:30
Jitendra Singh	0da87c716e	Merge pull request #6248 from jitendra-webkul/master ... Issue #6243 fixed	2022-04-06 14:47:56 +05:30
Jitendra Singh	e1c3c6dcbb	Merge pull request #6240 from Anmol-Chauhan/add-currency-icon ... issue #5559 fixed	2022-04-06 14:44:43 +05:30
jitendra	9a5965be00	Issue #6243 fixed	2022-04-06 14:38:35 +05:30
Devansh	130834141e	Property Name Updated	2022-04-06 13:06:36 +05:30
Devansh	3dde20151b	PHPDoc Added	2022-04-06 12:55:43 +05:30
Devansh	3bcde84226	Currency Symbol And Product Listing Fixed	2022-04-06 12:53:07 +05:30
Jitendra Singh	a181eeed4e	Merge pull request #6239 from Anmol-Chauhan/link-admin-product-to-front-page ... issue #6197 fixed	2022-04-06 11:35:16 +05:30
Anmol-Chauhan	1db6343dc1	changes done	2022-04-06 09:59:32 +05:30
Anmol-Chauhan	6e2d454d9f	Requested changes done	2022-04-05 20:03:02 +05:30
Anmol-Chauhan	69eb9237a6	issue #5559 fixed	2022-04-05 19:55:46 +05:30
Anmol-Chauhan	4a92b434d5	requested changes done	2022-04-05 19:46:58 +05:30
Anmol-Chauhan	7c3702be49	issue #6197 fixed	2022-04-05 19:29:45 +05:30
jitendra	622079a26b	Issue #5967 fixed	2022-04-05 19:24:58 +05:30
jitendra	ad427a0ef8	Conflicts resolved	2022-04-05 18:27:37 +05:30
jitendra	fd7c6f1e98	Issue #6002 fixed	2022-04-05 18:25:17 +05:30
Jitendra Singh	6b3e902593	Merge pull request #6231 from devansh-webkul/bagisto-publishables ... Bagisto Publishable Command #6213	2022-04-05 18:24:27 +05:30