Commit Graph

6021 Commits

Author SHA1 Message Date
devansh bawari 6f367e0a69 Merge branch 'master' into allowed_ip_issue 2021-03-01 10:15:41 +05:30
Glenn Hermans 8caecd4bd6
Merge pull request #4688 from devansh-webkul/issue-4685
Fixed blank space which remains on the homepage when disabling out of stock item from backend #4685
2021-02-26 16:11:57 +01:00
Nikolay Andreev 1097fa84f2 Changes 2021-02-26 11:44:10 +02:00
devansh bawari b94a41a39d Merge remote-tracking branch 'upstream/master' into issue-4685 2021-02-25 18:38:10 +05:30
devansh bawari de0c76eaa1 Handled Null Case 2021-02-25 18:37:40 +05:30
devansh bawari a7cd68545b Remove Icon Added 2021-02-25 11:26:48 +05:30
devansh bawari 52b24a3566 Layout Fixed 2021-02-25 11:26:48 +05:30
devansh bawari e269272776 Allowed IP Exception Handled 2021-02-24 11:50:53 +05:30
nikolayandreev 93a5ec7d56 Revert the parameter rename, but keep new functionality 2021-02-23 13:51:19 +02:00
nikolayandreev a352370394 Progress 2021-02-23 13:51:19 +02:00
nikolayandreev 0f27f5c880 Added back getMinimalPrice in AbstractType 2021-02-23 13:51:19 +02:00
nikolayandreev d6398da5c3 Changed ProductController key for API endpoint /products?category_id to /products?categories=1,2,3 or categories=1 2021-02-23 13:51:19 +02:00
nikolayandreev b3e1c63fd3 Add capability to serach via multiple categoryIds in the REST API 2021-02-23 13:51:19 +02:00
nikolayandreev 63d86f5def Update getMaximamPrice() to return product price instead of getMinimalPrice() in AbstractType.
Solving issue with Simple products where price and special_price were the same amount in the REST API.
2021-02-23 13:51:19 +02:00
Glenn Hermans 30c0560e96
Merge pull request #4669 from devansh-webkul/issue-4641
User Friendly Messages Updated #4641
2021-02-22 14:35:50 +01:00
devansh bawari d5b478fb84 Translation Added 2021-02-22 18:33:03 +05:30
devansh bawari 5388dc04dc Message Fixed 2021-02-22 18:12:41 +05:30
devansh bawari fb8b0f64ca Messages Updated! 2021-02-22 17:46:09 +05:30
rahul shukla 46b2ab9dd2 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-22 15:03:54 +05:30
rahul shukla 04ca4fac7d Issue #4344 fixed 2021-02-22 15:03:38 +05:30
devansh bawari 5303059a94 Asterisk Added 2021-02-22 10:07:13 +05:30
rahul shukla 82c15cc62d Issue #4659 fixed 2021-02-19 18:46:42 +05:30
rahul shukla ea66157655 Issue #4645 fixed and product videos added in product api 2021-02-19 15:43:21 +05:30
rahul shukla e581c950df Issue #4643 fixed 2021-02-19 13:34:39 +05:30
Jitendra Singh cc35f228f5
Merge pull request #4639 from rahulshukla-webkul/optimization
Optimization
2021-02-16 12:34:14 +05:30
rahul shukla a95c04470a Conflict resolve and check added 2021-02-16 12:23:15 +05:30
Jitendra Singh d8500e24d3
Merge pull request #4537 from vivek-webkul/patch-44
[Updated: Duplicate queries removed.]
2021-02-16 12:08:27 +05:30
rahul shukla 3abc4aa80d optimization 2021-02-16 11:23:29 +05:30
rahul shukla 06ce1abb82 Merge branch 'master' of https://github.com/bagisto/bagisto into 4573 2021-02-15 18:30:30 +05:30
rahul shukla f16f36766b fixes as per comment 2021-02-15 18:20:30 +05:30
Glenn Hermans bfb5915b4d
Merge pull request #4619 from devansh-webkul/issue-4615
Fixed back icon which is not working properly at admin end #4615
2021-02-15 11:21:54 +01:00
rahul shukla db30a2e442 fixes as per comment 2021-02-15 15:38:08 +05:30
rahul shukla b1464eb91a Issue #4624 fixed 2021-02-15 13:47:27 +05:30
Glenn Hermans 74e97d231d
Merge pull request #4622 from devansh-webkul/blank-channel-slider
Blank Channel Name On Slider Fixed
2021-02-12 17:20:01 +01:00
devansh bawari 61959d6727 Blank Channel Name On Slider Fixed 2021-02-12 21:24:42 +05:30
devansh bawari 663946cd7c Merge branch 'master' into optimization 2021-02-12 21:13:21 +05:30
devansh bawari 6e42efbb18 Fixed One Route 2021-02-12 21:08:32 +05:30
devansh bawari ff343b9e6d Routes Added 2021-02-12 20:56:21 +05:30
devansh bawari d66438289a Core Config Check Added 2021-02-12 20:08:35 +05:30
devansh bawari fa540e0262 Merge remote-tracking branch 'upstream/master' into issue-4615 2021-02-12 19:15:26 +05:30
devansh bawari b6e0621e9e For Add And Edit Product Index Route Added 2021-02-12 19:14:53 +05:30
rahul shukla f37d157461 Merge branch 'master' of https://github.com/bagisto/bagisto into 4573 2021-02-12 19:10:23 +05:30
rahul shukla bce929dab9 Issue #4573 fixed 2021-02-12 19:10:09 +05:30
Glenn Hermans 5f16a87b2c
Merge pull request #4614 from devansh-webkul/issue-4597
Fixed add a product to wishlist twice issue #4597
2021-02-12 14:38:16 +01:00
Glenn Hermans dd89361778
Merge pull request #4559 from devansh-webkul/paypal-refund-feature
Paypal refund feature added
2021-02-12 14:19:47 +01:00
Glenn Hermans ab7eadaa22
Merge pull request #4612 from devansh-webkul/issue-4592
Fixed layout issues on front end #4592
2021-02-12 14:19:36 +01:00
Glenn Hermans df6308cb68
Merge pull request #4595 from devansh-webkul/issue-4588
Fixed channel drop down which gets blank when admin panel filter based on new locale #4588
2021-02-12 14:19:21 +01:00
devansh bawari 6cd6b94af9 Extra Usage Checks For The Support 2021-02-12 17:53:17 +05:30
devansh bawari af4d625c55 Merge remote-tracking branch 'upstream/master' into issue-4597 2021-02-12 17:38:23 +05:30
devansh bawari 1840b804db Wishlist And Some Code Enhanced 2021-02-12 17:37:53 +05:30