Commit Graph

6209 Commits

Author SHA1 Message Date
devansh bawari 65661e0f25 Query Enhanced 2021-02-28 23:46:19 +05:30
devansh bawari 13610a8dcf DB Prefix Added 2021-02-27 19:04:31 +05:30
devansh bawari ea3c0874c3 Out Of Stock Query Updated For Configurable Product 2021-02-27 18:42:43 +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
rahul shukla 53b1447220 database prefix added 2021-02-26 14:31:51 +05:30
rahul shukla 872e936daa Query optimized 2021-02-26 14:02:36 +05:30
rahul shukla 20d3601ff1 merge with master 2021-02-26 12:29:06 +05:30
rahul shukla 77c3947ec2 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-26 12:26:36 +05:30
rahul shukla 2552900d62 Issue #4682 fixed 2021-02-26 12:26:12 +05:30
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 a20c9cc0e9 Merge branch 'master' into duplicate_order_issue 2021-02-24 16:53:27 +05:30
devansh bawari 574544efd3 Merge branch 'master' into web-vital-v2 2021-02-24 16:53:06 +05:30
devansh bawari e269272776 Allowed IP Exception Handled 2021-02-24 11:50:53 +05:30
devansh bawari 0d9a0f0edb Merge branch 'master' into web-vital-v2 2021-02-23 18:10:56 +05:30
devansh bawari 09e876e747 Merge branch 'master' into duplicate_order_issue 2021-02-23 18:10:36 +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 0f67bbe95f Merge branch 'master' into duplicate_order_issue 2021-02-22 10:50:04 +05:30
devansh bawari 26900badb6 Merge branch 'master' into web-vital-v2 2021-02-22 10:49:11 +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 9de96b117a Merge branch 'master' into web-vital-v2 2021-02-12 21:14:16 +05:30
devansh bawari 4b5d96076c Merge branch 'master' into duplicate_order_issue 2021-02-12 21:13:49 +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
rahul shukla 70bfa2d6f1 Enhncement #4264, multilocale for admin revrted 2021-02-12 16:34:34 +05:30
devansh bawari 38b7283633 Merge remote-tracking branch 'upstream/master' into issue-4592 2021-02-12 15:30:49 +05:30
devansh bawari b2695f69cb Slightly Top CSS Added 2021-02-12 15:30:27 +05:30
devansh bawari 423debb25b Merge remote-tracking branch 'upstream/master' into optimization 2021-02-12 11:50:01 +05:30
devansh bawari 0346ff74fb Merge remote-tracking branch 'upstream/master' into duplicate_order_issue 2021-02-12 11:35:17 +05:30
devansh bawari 81e5824dcd Recompiled 2021-02-12 11:32:32 +05:30
devansh bawari 67c1c91f71 Merge branch 'master' into web-vital-v2 2021-02-12 11:31:06 +05:30
devansh bawari 84c9e73a81 Fixed Duplicate Buttons Issue -> https://github.com/bagisto/bagisto/issues/4609 2021-02-12 11:22:22 +05:30
devansh bawari 7302bdc08e Search Issue Fixed 2021-02-12 10:29:48 +05:30
devansh bawari 61812ab4e5 Merge remote-tracking branch 'upstream/master' into issue-4588 2021-02-12 09:49:06 +05:30
devansh bawari 39ef3606c6 Reverted One File And One Colon Removed 2021-02-12 09:45:39 +05:30
Glenn Hermans 1efb44c947
Merge pull request #4599 from devansh-webkul/issue-4592
Fixed layout issues on front end #4592 and Datagrid issue #4596
2021-02-11 17:15:36 +01:00
devansh bawari 9f7555244f Fallback From Config Added 2021-02-11 20:16:14 +05:30
devansh bawari 70af72965d Configuration Issue Fixed 2021-02-11 19:34:05 +05:30
devansh bawari a4d477bc65 Exception Fixed 2021-02-11 19:09:55 +05:30
devansh bawari 7ab0946841 Channel Exception Fixed 2021-02-11 18:48:19 +05:30
devansh bawari be505282de Merge remote-tracking branch 'upstream/master' into issue-4588 2021-02-11 18:45:11 +05:30
devansh bawari 265f4eafc2 Fallback Added 2021-02-11 18:42:50 +05:30
devansh bawari df6e890dfe Method Added For Fetching Channel Name 2021-02-11 18:04:45 +05:30
Glenn Hermans 50e60bc675
Merge pull request #4608 from rahulshukla-webkul/4583
Issue #4583 fixed
2021-02-11 13:31:12 +01:00
Glenn Hermans 18a4ece78e
Merge pull request #4586 from devansh-webkul/some-enhancement
Two properties moved to abstract class
2021-02-11 13:30:56 +01:00
devansh bawari f8f432058e Merge remote-tracking branch 'upstream/master' into issue-4588 2021-02-11 17:04:56 +05:30
devansh bawari 589425f2a1 Streteched Issue Fixed 2021-02-11 17:00:01 +05:30
devansh bawari 1132247409 Merge remote-tracking branch 'upstream/master' into issue-4592 2021-02-11 16:59:40 +05:30
rahul shukla f4c647fdff conditions added 2021-02-11 16:51:50 +05:30
devansh bawari f4ef06af6e Checked For The Requested Locale In Channel 2021-02-11 16:43:47 +05:30
Glenn Hermans 4d005d9041
Merge pull request #4601 from rahulshukla-webkul/4590
Issue #4590 fixed
2021-02-11 11:57:38 +01:00
rahul shukla 398fbdc7eb Issue #4583 fixed 2021-02-11 15:59:45 +05:30
rahul shukla c35fe27888 Issue #4590 fixed as per comment 2021-02-11 15:36:52 +05:30
devansh bawari 68ab2d8779 Completed: Channel multiselect option also gets blank https://prnt.sc/z2f9ek 2021-02-11 14:55:41 +05:30
devansh bawari 2efb321b1c Completed: No filteration should be done in channel grid when admin filter new locale https://prnt.sc/z23l9a 2021-02-11 14:47:52 +05:30
devansh bawari 8979bad283 Fixed -> When you filter admin locale (add new locale and filter from top right corner) and go to product grid https://prnt.sc/z239b3 2021-02-11 14:40:34 +05:30
devansh bawari a9b803c7f3 Reverted One File 2021-02-11 14:09:25 +05:30
devansh bawari 3e049e0e91 Merge branch 'master' into paypal-refund-feature 2021-02-11 12:27:49 +05:30
devansh bawari 6242ef9060 Merge remote-tracking branch 'upstream/master' into issue-4592 2021-02-11 10:45:39 +05:30
devansh bawari 15369d7a86 Datagrid Issue Fixed In Shops 2021-02-11 10:45:10 +05:30
Glenn Hermans 8e2083204b
Merge pull request #4602 from rahulshukla-webkul/development
Issue #4598 fixed
2021-02-10 16:29:12 +01:00
rahul shukla f1e8e4fc5a Issue #4598 fixed 2021-02-10 19:56:08 +05:30
Glenn Hermans 7e09297db1
Merge pull request #4581 from rahulshukla-webkul/development
Issue #4571 fixed.
2021-02-10 15:00:27 +01:00
devansh bawari 2dea0a79e3 Merge remote-tracking branch 'upstream/master' into paypal-refund-feature 2021-02-10 19:16:24 +05:30
rahul shukla 14f7a11fbe Issue #4590 fixed 2021-02-10 19:13:00 +05:30
devansh bawari 7a2e43a2da Case Checked With Request Only Rather Then Fallback 2021-02-10 19:08:10 +05:30
devansh bawari 0ee4cfec08 Fallback Added 2021-02-10 18:57:50 +05:30
rahul shukla b979fc0c3f video playing issue on velocity 2021-02-10 18:51:52 +05:30
devansh bawari bb0ee2d554 Recompiled 2021-02-10 18:23:01 +05:30
devansh bawari ff64b336fb Merge remote-tracking branch 'upstream/master' into issue-4592 2021-02-10 18:22:03 +05:30
devansh bawari 82270012a6 Buy Now Button Height Adjusted 2021-02-10 18:19:02 +05:30
devansh bawari 87731ce89e View Fixed 2021-02-10 18:02:04 +05:30
rahul shukla 8ae86f2fd1 fixes as per comment 2021-02-10 17:27:51 +05:30
devansh bawari 338e8f33d7 Fix Product View Page -> https://prnt.sc/yxj9kh 2021-02-10 16:55:58 +05:30
Glenn Hermans 044c7ba0cd
Merge pull request #4594 from prateek-webkul/master
Displaying variant image title on hover
2021-02-10 11:28:27 +01:00
Glenn Hermans 83adbf6eb7
Merge pull request #4575 from devansh-webkul/issue-4570
Alignment Fixed #4570
2021-02-10 11:28:06 +01:00
devansh bawari 363037e72c Translations Check Added 2021-02-10 14:09:32 +05:30
prateek srivastava 1a64e10955 displaying variant image description 2021-02-10 13:43:28 +05:30
devansh bawari 6733d9b203 Fixed Icon Issue 2021-02-10 13:25:48 +05:30
devansh bawari fb2b72a46c Merge branch 'master' into issue-4589 2021-02-10 11:49:35 +05:30
devansh bawari 1389c3e15d Compare Added With Check 2021-02-10 11:46:20 +05:30
rahul shukla 6a8fe7bc5b Issue #4565 2021-02-09 19:50:52 +05:30
rahul shukla 994e19d761 Issue #4566 and #4567 2021-02-09 19:21:29 +05:30
rahul shukla 8ab75bb805 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-09 19:20:21 +05:30
rahul shukla 8e0d5ebe2c Issue #4566 and #4567 2021-02-09 19:20:00 +05:30
devansh bawari e949f6b8f0 Merge branch 'master' into some-enhancement 2021-02-09 18:08:12 +05:30
devansh bawari 579539eb60 Properties moved to Abstract Class 2021-02-09 17:57:45 +05:30
prateek srivastava 6fc5abe7ce getting exception upon request /category-details issue fixed 2021-02-09 17:05:26 +05:30
devansh bawari da551578b1 Wishlist Check Added 2021-02-09 14:14:20 +05:30
devansh bawari 36a8cf09ed Some CSS Issue Fixed 2021-02-09 11:56:07 +05:30
rahul shukla 1ba0eccd5d Issue #3571 2021-02-08 20:20:06 +05:30
Glenn Hermans b4951d7f64
Merge pull request #4580 from devansh-webkul/issue-4569
Config Check Added #4569
2021-02-08 15:34:34 +01:00
devansh bawari e0852ec285 Alignment Fixed 2021-02-08 19:38:57 +05:30
Glenn Hermans b7a70d7f5a
Merge pull request #4562 from rahulshukla-webkul/4561
Issue #4561 fixed
2021-02-08 14:55:49 +01:00
devansh bawari 13ba8c934f More Checks Added 2021-02-08 19:14:51 +05:30
rahul shukla 85c3048a38 failing checks 2021-02-08 18:23:43 +05:30
devansh bawari bc114f4eb1 Config Check Added 2021-02-08 18:11:35 +05:30
rahul shukla da5596db92 Issue #4577 2021-02-08 16:15:45 +05:30
rahul shukla 75ea2e3e13 Merge branch 'master' of https://github.com/bagisto/bagisto into 4561 2021-02-08 15:47:48 +05:30
rahul shukla 94491226d8 decimal field for minimum order 2021-02-08 15:47:33 +05:30
devansh bawari 542ccf92d3 Added Missing Method 2021-02-08 14:51:59 +05:30
devansh bawari d2b032a4d1 Merge branch 'master' into optimization 2021-02-08 14:41:49 +05:30
devansh bawari 5f959d459d Alignment Fixed 2021-02-08 14:35:29 +05:30
devansh bawari 2939f6943e Merge branch 'master' into web-vital-v2 2021-02-05 20:18:10 +05:30
devansh bawari 30149d22d0 Merge branch 'master' into paypal-refund-feature 2021-02-05 20:18:03 +05:30
devansh bawari 1711e3c517 Merge branch 'master' into issue-4544 2021-02-05 20:17:53 +05:30
devansh bawari 9fec7ea89b Confliction Resolved On Merging 2021-02-05 19:52:20 +05:30
devansh bawari c1d4714c5b Merge branch 'master' into duplicate_order_issue 2021-02-05 19:36:55 +05:30
Glenn Hermans bf1c3f21af
Merge pull request #4550 from prateek-webkul/master
replaced product image and product video helper with facades
2021-02-05 13:49:43 +01:00
devansh bawari 3c7b81e960 Merge remote-tracking branch 'upstream/master' into issue-4544 2021-02-05 18:05:48 +05:30
devansh bawari 17177f2a95 Overflow Issue Fixed 2021-02-05 18:05:18 +05:30
rahul shukla c763bbced1 Issue #4561 fixed 2021-02-05 16:39:46 +05:30
rahul shukla 25e3561897 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-05 15:25:38 +05:30
rahul shukla 55f8fd6cc0 Issue #4558 fixed 2021-02-05 15:25:07 +05:30
devansh bawari 5bb09dbe9f Error Handling 2021-02-05 15:02:34 +05:30
devansh bawari 4d8a6cf0ed Refactoring Done 2021-02-05 14:44:51 +05:30
devansh bawari f5c3501aab Merge branch 'master' into paypal-refund-feature 2021-02-05 12:38:48 +05:30
devansh bawari 5bbad4dbe2 Partial Refund Completed 2021-02-05 12:37:47 +05:30
devansh bawari 1ef31deeb1 Some More Key Changed For Understanding 2021-02-04 19:37:42 +05:30
prateek srivastava d0f06bb463 removed duplicate statement 2021-02-04 19:25:28 +05:30
devansh bawari b3bc0efa39 Routes Name Enhanced For Better Understanding 2021-02-04 19:13:59 +05:30
prateek srivastava 20f2784099 added helper for facades 2021-02-04 18:56:52 +05:30
prateek srivastava fd7fdfe385 changes in facade 2021-02-04 18:12:02 +05:30
Glenn Hermans 953e6d14ea
Merge pull request #4546 from rahulshukla-webkul/development
Issue #4545
2021-02-04 13:11:39 +01:00
rahul shukla 765cd5dab6 missing conditions adeded 2021-02-04 17:05:32 +05:30
devansh bawari 8e7c11b4c0 Merge remote-tracking branch 'upstream/master' into paypal-refund-feature 2021-02-04 17:00:13 +05:30
devansh bawari f04c065edd Full Refund Payment Completed & Partial Pending 2021-02-04 16:52:28 +05:30
prateek srivastava a87ad99201 product-detail image helper removed 2021-02-04 16:41:16 +05:30
prateek srivastava ad18b254c4 fixed facade issue 2021-02-04 16:36:26 +05:30
prateek srivastava d29b0a69a5 fixed conflict 2021-02-04 16:31:22 +05:30
rahul shukla 27c0a4f8ee Order cancelation for downloadble product 2021-02-04 15:26:14 +05:30
devansh bawari 5640880c1a Space Issue Fixed 2021-02-04 10:40:14 +05:30
Glenn Hermans 5f5813520c
Merge pull request #4272 from darinda/patch-1
Allow to disable actions on a per-row (per-record) basis
2021-02-03 15:49:43 +01:00
rahul shukla f6a6501a62 Issue #3893 done 2021-02-03 19:59:31 +05:30
rahul shukla fa045541e5 Issue #4545 2021-02-03 18:48:45 +05:30
Glenn Hermans 14a41c0ff2
Merge pull request #4540 from devansh-webkul/issue-4539
Fixed slider arrow should point out in opposite direction #4539
2021-02-03 13:34:28 +01:00
devansh bawari b5548f48c6 Today's Work - Capture ID Pending 2021-02-03 17:12:39 +05:30
devansh bawari 1de08b17cf Paypal Order Data Captured 2021-02-03 12:53:34 +05:30
devansh bawari b6a268fee2 Merge branch 'master' into web-vital-v2 2021-02-02 16:54:18 +05:30
devansh bawari c57a78b2e3 Merge branch 'master' into optimization 2021-02-02 16:54:14 +05:30
devansh bawari 826bd2ae33 Merge branch 'master' into issue-4539 2021-02-02 16:54:12 +05:30
devansh bawari c3a676b1bb Merge branch 'master' into duplicate_order_issue 2021-02-02 16:54:08 +05:30
devansh bawari 9c6f304e39 Merge remote-tracking branch 'upstream/master' into issue-4542 2021-02-02 15:22:44 +05:30
devansh bawari ead9500ef3 Proper Format Date Added 2021-02-02 15:22:15 +05:30
devansh bawari 5240765f2d Added Same As EN For AR Slider 2021-02-02 11:19:08 +05:30
devansh bawari a4fdc4e736 Merge branch 'master' into web-vital-v2 2021-02-01 19:49:08 +05:30
devansh bawari 8804f57ecf Merge branch 'master' into optimization 2021-02-01 19:49:04 +05:30
devansh bawari f8077a7736 Merge branch 'master' into issue-4510 2021-02-01 19:49:00 +05:30
devansh bawari d65035e656 Merge branch 'master' into duplicate_order_issue 2021-02-01 19:48:57 +05:30
devansh bawari c2992d1b8e API All Product's Extra Information Added 📝 2021-02-01 19:31:45 +05:30
Vivek a489e1a926 [Updated: Duplicate queries removed.] 2021-02-01 19:01:08 +05:30
rahul shukla 6c69025a13 Issue #4532 fixed 2021-02-01 17:28:37 +05:30
rahul shukla 1f6f7a3bac corrected spelling 2021-02-01 16:44:46 +05:30
rahul shukla c9d09731e1 chnage according to comment 2021-02-01 16:40:13 +05:30
rahul shukla 8ce02ab43b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-02-01 15:35:20 +05:30
rahul shukla a8cdf29fc7 Issue #3572, fixes percentage for 2 decimal values 2021-02-01 15:35:04 +05:30
devansh bawari 3fddc7cdfd Typo Checked 2021-02-01 11:38:20 +05:30
devansh bawari cd26f99153 Extra Info Added 2021-02-01 11:35:56 +05:30
Glenn Hermans 9af300b202
Merge pull request #4530 from rahulshukla-webkul/development
Issue #3269 fixed
2021-01-29 15:34:02 +01:00