Commit Graph

6016 Commits

Author SHA1 Message Date
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 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
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 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 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 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 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
devansh bawari fe9c39e90e Merge remote-tracking branch 'upstream/master' into optimization 2021-01-29 19:16:02 +05:30
devansh bawari 2e03a4dde4 Merge remote-tracking branch 'upstream/master' into issue-4510 2021-01-29 19:15:59 +05:30
rahul shukla 73e4deebaf Fixes according to chnages 2021-01-29 16:58:35 +05:30
rahul shukla 10f45d9fa8 Issue #3269 fixed 2021-01-29 15:54:39 +05:30
Glenn Hermans e1a32a2f83
Merge pull request #4507 from rahulshukla-webkul/development
Issue #3572 done
2021-01-29 09:59:36 +01:00
rahul shukla bbeccdeaaf fixes accoeding comment 2021-01-29 12:40:48 +05:30
rahul shukla 9ceddf20ec Fixes according to comment 2021-01-28 19:10:28 +05:30
Glenn Hermans 8752e1076a
Merge pull request #4526 from devansh-webkul/ip-fix
Dynamic url for route checking added for datagrids
2021-01-28 13:42:42 +01:00
rahul shukla 1121aac957 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-28 16:12:52 +05:30
rahul shukla f005a92534 Issue #4523 2021-01-28 16:12:35 +05:30
devansh bawari 20db497eae IP Fixed On Datagrid 2021-01-28 13:05:15 +05:30
rahul shukla ec467a2a0f Issue #4495 fixed 2021-01-27 17:24:03 +05:30
devansh bawari dab3393e38 Fixed Extra Question Mark 2021-01-27 15:11:20 +05:30
rahul shukla 5b05cf75f4 Issue #3572 fixes according to comment 2021-01-27 14:58:54 +05:30
rahul shukla 5620817db2 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-27 14:07:35 +05:30
devansh bawari 04a28f50f0 Merge branch 'master' into issue-4510 2021-01-27 12:38:50 +05:30
devansh bawari a8469691b5 Merge branch 'master' into optimization 2021-01-27 12:38:14 +05:30
devansh bawari 37dd015d98 Merge remote-tracking branch 'upstream/master' into perm-fix 2021-01-27 10:55:46 +05:30
devansh bawari 72d94b7abc Manual Require Removed 2021-01-27 10:55:00 +05:30
Poghos bd4ec58f58 Merge branch 'master' of github.com:bagisto/bagisto into patch-1 2021-01-26 12:25:01 +04:00
Poghos a6cacb93da Added checking for the route existence for Bundle, Downloadable, Grouped types. 2021-01-25 18:32:26 +04:00
Poghos Boyajyan 203483a5c0
Added checking for the route existence in request 2021-01-25 18:13:40 +04:00
Poghos Boyajyan beb1fbf409
Added checking for the route existence in request 2021-01-25 17:59:52 +04:00
Poghos Boyajyan c7411ce00b
Added checking for the route existence in request 2021-01-25 17:58:43 +04:00
devansh bawari 5fb43a7d0e Merge branch 'master' into optimization 2021-01-22 19:19:26 +05:30
devansh bawari 447e095d0e Merge branch 'master' into issue-4510 2021-01-22 19:15:48 +05:30
rahul shukla 05597e3225 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-22 17:38:27 +05:30
rahul shukla b3b1dadca9 Issue #fixes as per comment 2021-01-22 17:38:00 +05:30
Glenn Hermans 2b4ca622b4
Merge pull request #4499 from devansh-webkul/issue-4498
Category checked by ID #4498
2021-01-22 13:04:13 +01:00
devansh bawari 8b74d496e3 API Updated 2021-01-22 17:28:15 +05:30
devansh bawari 0bd2762da9 Comments Updated 2021-01-22 13:25:49 +05:30
devansh bawari 44374fd349 Mass Delete Check Added 2021-01-22 13:08:12 +05:30
devansh bawari b0a86594fe Name Changed 2021-01-22 12:20:15 +05:30
devansh bawari b81c91e3b2 Typo Fixed 2021-01-22 11:17:25 +05:30
devansh bawari 6879605b52 Channel Root Category IDs Check Added 2021-01-22 11:15:53 +05:30
devansh bawari 7f378bc914 Merge remote-tracking branch 'upstream/master' into issue-4498 2021-01-22 11:06:36 +05:30
Glenn Hermans 9fc76b90ad
Merge pull request #4509 from devansh-webkul/issue-4506
Customer group pricing fixed discount now accept decimal values #4506
2021-01-22 05:57:00 +01:00
devansh bawari 236cfe4fd1 Remove 1 Line And Sorted Imports 2021-01-21 19:40:38 +05:30
devansh bawari bc95c19d6a Removed From Marketing Provider 2021-01-21 19:36:57 +05:30
rahul shukla b6639ab0eb did the required changes 2021-01-21 13:56:32 +05:30
devansh bawari a4e610ce53 Merge branch 'master' into issue-4506 2021-01-21 12:33:38 +05:30
devansh bawari 3242e591ab Step Added 2021-01-21 11:48:48 +05:30
rahul shukla 54002459f3 Issue #3572 done 2021-01-20 20:55:12 +05:30
Glenn Hermans c760d76e28
Merge pull request #4503 from rahulshukla-webkul/development
Development
2021-01-20 16:06:53 +01:00
rahul shukla 4ba2ed0e3b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-20 15:00:51 +05:30
rahul shukla ed1ae6aed5 Issue #4435 and #4436 2021-01-20 15:00:37 +05:30
devansh bawari 01f6ff496b Merge branch 'master' into issue-4498 2021-01-20 14:14:44 +05:30
devansh bawari 4f6ebe7829 Merge branch 'master' into optimization 2021-01-20 14:12:49 +05:30
devansh bawari 1807451477 Merge remote-tracking branch 'upstream/master' 2021-01-20 13:45:01 +05:30
devansh bawari 01bcc22c42 Slider Space Fixed 2021-01-20 13:44:24 +05:30
devansh bawari 04c693fc4f Category Checked By ID 2021-01-19 14:38:37 +05:30
andy cdd037e0ae fix typo 2021-01-19 16:09:53 +09:00
rahul shukla 9f67e46ef8 added missed condition in marketing 2021-01-18 20:13:46 +05:30
devansh bawari 4ac8ca942f Merge branch 'master' into optimization 2021-01-18 18:52:31 +05:30
rahul shukla e61d89a3d0 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-18 16:24:09 +05:30
rahul shukla 142f04ad41 fixing as per comment 2021-01-18 16:23:53 +05:30
Glenn Hermans 2b276acd55
Merge pull request #4493 from devansh-webkul/temp-fix
Manual Require Added Till Merging Of Autoloading Fix #4420
2021-01-18 10:59:48 +01:00
devansh bawari 99f797c814 Manual Require Added 2021-01-18 10:51:32 +05:30
Glenn Hermans 0a22c34b4d
Merge pull request #4485 from devansh-webkul/issue-4481
Fixed shipping costs which are not calculated with grand total #4481
2021-01-15 23:13:48 +01:00
rahul shukla 57b89f53ee enhancement #4468 added for velocity theme 2021-01-15 19:00:55 +05:30
Poghos Boyajyan 705350f932
Added condition that allow to use repository in console mode 2021-01-15 17:05:10 +04:00
rahul shukla 3420f282ff Issue #4432 fixed 2021-01-15 18:26:27 +05:30
rahul shukla 228473851e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-15 16:53:42 +05:30
Glenn Hermans 1368124ed4
Merge pull request #4464 from devansh-webkul/issue-4399
Fixed role-based security issue in which user with no permission has acces to some admin pages/controls #4399
2021-01-15 12:19:17 +01:00
rahul shukla 349c39fdc9 Enhancement #4468 done 2021-01-15 15:57:54 +05:30
rahul shukla ada41f9416 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-15 13:28:06 +05:30
rahul shukla 6d59ac6515 Issue #4486 fixed 2021-01-15 13:27:46 +05:30
devansh bawari bf154aa2c4 Added Case Back 2021-01-15 11:09:07 +05:30
Glenn Hermans c127e7429c
Added publish path for shop views 2021-01-14 18:08:57 +01:00
devansh bawari 70c41055c7 Merge branch 'master' into optimization 2021-01-14 20:53:28 +05:30
devansh bawari 567d3b6380 Merge remote-tracking branch 'upstream/master' into issue-4399 2021-01-14 20:16:49 +05:30
devansh bawari a37f0dc027 Latest Translation Key Added 2021-01-14 20:16:35 +05:30
devansh bawari 88ac63470e ACL Added For Addresses, Notes, Promotions And Copy Product 2021-01-14 20:06:12 +05:30
Glenn Hermans 745f9ea337
Updated status and calculate tax for admin 2021-01-14 03:52:15 +01:00
devansh bawari 266760d386 Merge remote-tracking branch 'upstream/master' into optimization 2021-01-13 19:54:15 +05:30
devansh bawari af78612c54 Merge remote-tracking branch 'upstream/master' into issue-4399 2021-01-13 18:51:31 +05:30
Glenn Hermans 7fd932992e
Merge pull request #4469 from dejavuejs/patch-2
Asynchronous callbacks for checkout page.
2021-01-13 14:00:55 +01:00
devansh bawari 0283c56df1 Syncing Of Method With Routes 2021-01-13 18:30:20 +05:30
devansh bawari 27e26d7d35 Feature Hidden If Not Authorised 2021-01-13 18:29:57 +05:30