merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,858 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

1339 Commits

Author SHA1 Message Date
Jitendra Singh a57c3e0ba7
Merge pull request #892 from jitendra-webkul/jitendra 
price issue fixed
 2019-04-29 15:42:13 +05:30
jitendra 5c68618416 price issue fixed 2019-04-29 15:41:31 +05:30
rahul shukla 8d64ba656a option attribute in layred navigation & category changes 2019-04-26 19:06:18 +05:30
rahul shukla 2674fbb9ca issue #850 2019-04-26 15:31:01 +05:30
rahul shukla 23431e5083 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-26 12:44:38 +05:30
Jitendra Singh 34aeeac2d0
Merge pull request #884 from jitendra-webkul/jitendra 
Jitendra
 2019-04-26 12:44:24 +05:30
jitendra 10e92dada3 Now variant's super attributes values are saving in product_flat table 2019-04-26 12:43:42 +05:30
rahul shukla 8019f49765 issue #879 2019-04-26 11:18:15 +05:30
rahul shukla 5e6131102b issue #866 & #845 2019-04-25 14:11:49 +05:30
rahul shukla deb209d140 confirm box on delete 2019-04-25 13:05:35 +05:30
rahul shukla c09e000eb9 removal of view from customers service provider 2019-04-24 18:34:26 +05:30
rahul shukla 85af8e8402 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-24 17:57:30 +05:30
rahul shukla 75e74dfb7e issue #867 shipment issue 2019-04-24 17:57:16 +05:30
jitendra c4c55bc48d Refactored cart class 2019-04-24 17:09:46 +05:30
Jitendra Singh 55e19c32c5
Merge pull request #873 from rahulshukla-webkul/development 
issue #865 description
 2019-04-24 16:26:37 +05:30
rahul shukla fb15e48c4d issue #865 description 2019-04-24 16:14:35 +05:30
Jitendra Singh 43a39dc77c
Merge pull request #872 from jitendra-webkul/jitendra 
Fixed guard spell mistake
 2019-04-24 16:06:19 +05:30
jitendra 28fc43fbfa Fixed guard spell mistake 2019-04-24 16:05:29 +05:30
Jitendra Singh 723ecc88d9
Merge pull request #871 from jitendra-webkul/jitendra 
Update Cart in order make compatible for api and session guard
 2019-04-24 15:57:07 +05:30
jitendra ee056ee917 Update Cart in order make compatible for api and session guard 2019-04-24 15:55:49 +05:30
Jitendra Singh 1f86376ffe
Merge pull request #870 from jitendra-webkul/jitendra 
Configurable product add to cart issue fixed
 2019-04-24 15:10:30 +05:30
jitendra ac03710f07 Configurable product add to cart issue fixed 2019-04-24 15:09:55 +05:30
rahul shukla 8b0787ad53 issue #835 2019-04-24 14:45:57 +05:30
rahul shukla 423d3d1bbf issues 2019-04-24 10:48:12 +05:30
rahul shukla c4eb615328 issue #842 2019-04-23 18:53:41 +05:30
rahul shukla e52c426600 dashboard & issue #841 2019-04-23 16:20:33 +05:30
rahul shukla 538c4beab0 merge with master 2019-04-23 15:40:06 +05:30
rahul shukla 9903d23dfe change in category menu 2019-04-23 15:38:11 +05:30
jitendra 7a5c3f1bdc Assets compiled for production 2019-04-23 12:58:47 +05:30
Jitendra Singh 64ee90f372
Merge pull request #860 from jitendra-webkul/jitendra 
Created new route for 404 page
 2019-04-23 12:44:37 +05:30
jitendra b5c762b528 Created new route for 404 page 2019-04-23 12:43:42 +05:30
rahul shukla 148ff7c1e8 merge with master 2019-04-23 12:36:05 +05:30
Jitendra Singh adfc375091
Merge pull request #859 from jitendra-webkul/jitendra 
Issue #851 fixed
 2019-04-23 11:17:25 +05:30
jitendra 9d65030779 Issue #851 fixed 2019-04-23 11:16:34 +05:30
Jitendra Singh 66b9cec73f
Merge pull request #858 from jitendra-webkul/jitendra 
Issue #855 fixed
 2019-04-23 11:03:48 +05:30
jitendra e18fd4e5c4 Issue #855 fixed 2019-04-23 11:03:05 +05:30
Jitendra Singh 025a34d99f
Merge pull request #857 from jitendra-webkul/jitendra 
Issue #840 fixed
 2019-04-23 10:33:58 +05:30
jitendra c585186a88 Issue #840 fixed 2019-04-23 10:33:10 +05:30
rahul shukla 560d1fb0bc issue #856 2019-04-22 20:52:36 +05:30
rahul shukla 0239b7ec0b issue #846 2019-04-18 20:22:37 +05:30
rahul shukla 148f942c4a issue #848 2019-04-18 19:15:14 +05:30
rahul shukla 600bf55f1f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-18 17:18:15 +05:30
Jitendra Singh d2868f6316
Merge pull request #849 from jitendra-webkul/jitendra 
Fixed urldecode issue in search temm
 2019-04-18 17:17:55 +05:30
jitendra f9e174ea70 Fixed urldecode issue in search temm 2019-04-18 17:16:36 +05:30
rahul shukla 26bd9f4283 issue #845 2019-04-18 17:16:07 +05:30
Jitendra Singh 7cd5bfe445
Merge pull request #847 from jitendra-webkul/jitendra 
Issue #840 fixed
 2019-04-18 15:51:53 +05:30
jitendra 7e826bef00 Issue #840 fixed 2019-04-18 15:50:03 +05:30
prateek srivastava 5b01493d26 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-18 13:04:10 +05:30
prateek srivastava 16b2b2a01f scroller fixed 2019-04-18 12:58:35 +05:30
jitendra 580d3ddf65 Resolve conflict 2019-04-18 12:56:36 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
rahul shukla 439652699e issue #836 2019-04-17 19:20:07 +05:30
rahul shukla 13ac4a9571 issue #824 2019-04-17 15:21:48 +05:30
rahul shukla 58ddc68520 issues 2019-04-17 12:56:33 +05:30
prateek srivastava df8f54597a scroller code removed 2019-04-17 12:30:50 +05:30
prateek srivastava eb5bad16ff removed code for scroller 2019-04-17 12:24:41 +05:30
rahul shukla ad6acfa7e0 issue #824 2019-04-16 20:15:28 +05:30
rahul shukla ae6d498f4c merge with master 2019-04-16 19:22:49 +05:30
prateek srivastava 558b416bb6 Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development 2019-04-16 19:22:03 +05:30
rahul shukla 3e97bacf91 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 19:19:26 +05:30
rahul shukla 095c045c58 change table of product datagrid to product_flat 2019-04-16 18:59:29 +05:30
jitendra 7fc68c56ae Added product id attribute to model 2019-04-16 16:37:52 +05:30
jitendra dd90e63ade Fixed add to cart issue 2019-04-16 16:32:30 +05:30
jitendra 1dd23a5a39 Changed varaible name productFlat to product in product card page 2019-04-16 16:02:04 +05:30
rahul shukla 4e56374c70 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 16:01:37 +05:30
jitendra 700a2951e6 added related products and up sells to the product view page 2019-04-16 15:57:38 +05:30
rahul shukla a4bb5a036b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 15:55:42 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development 
Development
 2019-04-16 15:46:32 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra 
Issue #803 fixed
 2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
rahul shukla d568ea4bbe merge with master 2019-04-16 15:35:54 +05:30
Prashant Singh 53ebbf5a1e Removed product grid events, product grid table is now obselete and maybe used in future for someother purposes. In result we will have a faster product creation and a new grid will be added with product flat table 2019-04-16 14:47:28 +05:30
Prashant Singh 1aa9bf78aa Removed unforced controller file from attribute package's Repositories directory 2019-04-16 14:41:12 +05:30
Prashant Singh af88e8951a Unnecessary Tax models removed from core, were originally moved from core to Tax module 2019-04-16 14:39:30 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
Prashant Singh 36f6c425c2 Assets compiled for production 2019-04-15 15:14:32 +05:30
Prashant Singh feaaaa89a5 fixed some style issues 2019-04-14 15:30:43 +05:30
Prashant Singh f35e9a48d8 corrected composer.json provider path for UI package 2019-04-13 10:33:23 +05:30
Prashant Singh 520c21a4cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-13 10:32:42 +05:30
rahul shukla 44c898824e removed duplicate entry in product linking 2019-04-12 18:43:42 +05:30
Prashant Singh 3fe8152758 added php tooltip.js dependency and laravel dusk for browser tests profiling 2019-04-12 18:20:33 +05:30
rahul shukla ee889cc259 upgrade code of zoom 2019-04-12 16:40:45 +05:30
rahul shukla 1caa3eb4f6 image zoom in rtl 2019-04-12 14:11:05 +05:30
rahul shukla 07b6ac6903 limit for up_sell, cross_sell & related product 2019-04-12 13:05:45 +05:30
rahul shukla f1c263805c issues #815 2019-04-10 16:45:52 +05:30
rahul shukla 2a859b7e23 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 15:08:15 +05:30
rahul shukla b99b0ad8b5 product attribute & category menu 2019-04-10 15:08:01 +05:30
Jitendra Singh ebc0befe6a
Merge pull request #813 from naresh-webkul/development 
Development
 2019-04-10 13:25:43 +05:30
rahul shukla d1e38fe83b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 12:12:15 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
naresh verma 4f999ee34a changed shipment table content 2019-04-09 19:40:43 +05:30
prateek srivastava f2def6c4bc scroller issue fixed 2019-04-09 19:28:44 +05:30
naresh verma ab4c054292 changed shipment table 2019-04-09 18:52:44 +05:30
rahul shukla b6a1a05e66 added permission of add & delete in acl 2019-04-09 18:52:03 +05:30
rahul shukla e5d71fa280 change in jquery for wishlist icon for zoom 2019-04-09 17:59:58 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
jitendra fb6ffaa9d9 JWT implemented for customer api authorization 2019-04-09 16:27:33 +05:30
rahul shukla 5e15e05c78 tax category message change 2019-04-09 16:15:04 +05:30
Jitendra Singh 7678593bd4
Merge pull request #812 from rahulshukla-webkul/development 
Development
 2019-04-09 15:52:46 +05:30
rahul shukla 6a7f247d7a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 15:30:52 +05:30