Commit Graph

3152 Commits

Author SHA1 Message Date
Prashant Singh 2ce18e5a49 Placing the conflicted files of show price after login and preorder to the actual paths instead of altering the original shop package view files 2019-07-02 14:23:21 +05:30
Prashant Singh 46d1ec1fc9 Over ride of summary.blade.php according to stripe connect done 2019-07-02 14:15:32 +05:30
Prashant Singh 9276a695b6 Some fixes in stripe 2019-07-02 14:09:26 +05:30
Prashant Singh 9042757f4f Updated the get root categories method inside category repository class 2019-07-02 13:04:14 +05:30
Prashant Singh 12c321e80e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-02 12:45:59 +05:30
Prashant Singh bfe52a7d3c Enabling coupon usage option for cart rules and start of the program convertxtoproductid 2019-07-02 12:45:30 +05:30
jitendra f529a128cd Removed unnecessary code from sevice providers 2019-07-01 20:03:16 +05:30
jitendra 318857b785 Now images will be deleted too if the model gets deleted 2019-07-01 19:42:12 +05:30
Jitendra Singh 47d375b264
Merge pull request #1146 from prateek-webkul/dev
change in Get root category
2019-07-01 18:12:18 +05:30
prateek srivastava 0e0cd7237a change in Get root category 2019-07-01 18:07:43 +05:30
jitendra b7d346260a Resolve conflicts 2019-07-01 17:12:44 +05:30
jitendra d646c74fb0 Removed phpinfo.php file 2019-07-01 17:06:34 +05:30
jitendra 366a5fdd20 Refactor code standard 2019-07-01 17:03:36 +05:30
Adrian Perez 0551886107
Update README.md
Fix heading for sponsors
2019-06-30 23:11:11 +02:00
Adrian Perez be24f5a86d
Update README.md
Improve backers and sponsors content and fix anchor
2019-06-30 23:10:35 +02:00
Adrian Perez f4be294219
Update README.md
Fix and remove numbering in anchors
2019-06-30 22:54:43 +02:00
Prashant Singh 350ffb1fa9 Fixes in preorder 2019-06-29 20:41:15 +05:30
Prashant Singh 07e90ae0f4 git add . 2019-06-29 20:40:28 +05:30
Prashant Singh 1c1dc3c834 fixed issue with preorder button not coming on storefront 2019-06-29 19:34:04 +05:30
Prashant Singh 170377509c Fixed search issue in preorder datagrid 2019-06-29 19:21:18 +05:30
Prashant Singh 3d352b690a Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-29 18:49:08 +05:30
Jitendra Singh e9608d87ef
Merge pull request #1143 from prashant-webkul/development
Development
2019-06-29 18:49:00 +05:30
Prashant Singh e0bbae7f8a Try catch handler in move to cart from wishlist 2019-06-29 18:47:22 +05:30
Prashant Singh be2b55a898 fixed event fire on movetocart from wishlist 2019-06-29 18:44:23 +05:30
Prashant Singh e7e9c24451 Preorder path fixes after updation 2019-06-29 18:35:27 +05:30
Prashant Singh da29f58531 Publishing for frontend files stopped for preorder and show price after login 2019-06-29 18:20:49 +05:30
Prashant Singh 1057cd654e Updated preorder in SAAS 2019-06-29 18:19:39 +05:30
Jitendra Singh 337c45426f
Merge pull request #1142 from rahulshukla-webkul/development
style for dashboard
2019-06-29 18:16:39 +05:30
Prashant Singh 1b43e9c253 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-29 18:14:42 +05:30
rahul shukla 2f905203a2 style for dashboard 2019-06-29 18:12:07 +05:30
jitendra f08a8036e6 Resolved conflict 2019-06-29 17:57:10 +05:30
jitendra 3ef416b22e Added downloadable order item info 2019-06-29 17:51:49 +05:30
Jitendra Singh 842a0f77d4
Merge pull request #1141 from prashant-webkul/development
Added cart item add before event
2019-06-29 17:50:14 +05:30
Prashant Singh e3bc993c99 Added cart item add before event 2019-06-29 17:24:41 +05:30
Prashant Singh 8155637f39 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-29 17:10:05 +05:30
Jitendra Singh 44af368b9c
Merge pull request #1139 from rahulshukla-webkul/development
css changes for overflow
2019-06-29 17:09:32 +05:30
Jitendra Singh 77af67ffd1
Merge pull request #1140 from prashant-webkul/development
Development
2019-06-29 17:09:19 +05:30
Prashant Singh ec2baa1be9 bug fix for event fire 2019-06-29 17:07:19 +05:30
Prashant Singh ff863fcc54 Added cart item add after event for move to cart from wishlist 2019-06-29 17:04:18 +05:30
Prashant Singh 3d02016db4 Customer document icon applied 2019-06-29 16:27:07 +05:30
Prashant Singh 4e8b5d875c Updated credit max 2019-06-29 16:02:03 +05:30
Prashant Singh 15690a1f0d Company id check removed from admins 2019-06-29 15:56:13 +05:30
Prashant Singh 8ef75d2be7 Fixed bug with admins user was coming in check with current company 2019-06-29 15:54:35 +05:30
Prashant Singh 67c3eeb25e customer document bug fix 2019-06-29 15:46:10 +05:30
Prashant Singh 76742eff85 Customer documents bug fix 2019-06-29 15:41:57 +05:30
rahul shukla b8c0f4aed6 css changes for overflow 2019-06-29 15:26:26 +05:30
jitendra ad6e422fdb Added downloadable and virtual products 2019-06-29 15:23:34 +05:30
Prashant Singh 6c003f949f Company check implemented in customer document module 2019-06-29 15:21:53 +05:30
Prashant Singh d164178609 Fixed a stripe transaction fee view bug in shop bundle 2019-06-29 14:52:15 +05:30
Prashant Singh 82db366587 Updated bulk add to cart and customer document 2019-06-29 14:46:42 +05:30