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

1545 Commits

Author SHA1 Message Date
rahul shukla 076f197de7 buy now issue 2019-06-14 21:04:22 +05:30
Prashant Singh c36950c609 applied translation string in apply coupon responses 2019-06-14 20:26:54 +05:30
Prashant Singh 0188644fce Prepared standard responses when applying couponable rules 2019-06-14 20:04:32 +05:30
Prashant Singh bb097be557 Added error message provision in the same when coupon application fails 2019-06-14 19:58:25 +05:30
Prashant Singh bec9ebe7fb coupon section fix in review-order component 2019-06-14 19:52:58 +05:30
Prashant Singh 1e865986c4 improved conditions check in applying cart rules 2019-06-14 19:24:15 +05:30
Prashant Singh da82f2935c removed some dead code 2019-06-14 17:55:03 +05:30
jitendra e26c2b4d89 Added Guest default customer group with id 0 2019-06-14 16:41:18 +05:30
jitendra 3f814d9253 Fixed checkout issue 2019-06-14 15:13:20 +05:30
Jitendra Singh 8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra 
Fixed checkout issue
 2019-06-14 15:00:15 +05:30
jitendra 5b81968bae Fixed checkout issue 2019-06-14 14:59:29 +05:30
rahul shukla c8fb37698c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-14 14:22:50 +05:30
rahul shukla 0bdd03b331 ticket 201 error & admin css for back icon 2019-06-14 14:22:22 +05:30
Prashant Singh 4bfefd3a07 base sync 2019-06-14 13:22:37 +05:30
Prashant Singh c52238e45e Cart rule frontend normalization 2019-06-14 13:21:17 +05:30
Prashant Singh 7f9409bd8e Checkout and cart page now coupled with cart rules 2019-06-14 12:10:03 +05:30
Prashant Singh e9a0588185 discount rule fixes 2019-06-13 22:19:44 +05:30
rahul shukla 5afef79ac2 merge with master 2019-06-13 20:24:52 +05:30
rahul shukla 1a36cd32c7 change query for min price of variant 2019-06-13 20:22:16 +05:30
jitendra 6e8c0da054 Fixed conflicts 2019-06-13 19:48:30 +05:30
jitendra 806f8f71f6 Added discount amount to cart item 2019-06-13 19:34:13 +05:30
Prashant Singh abf46c8a99 Added discount amount in cart item table 2019-06-13 19:30:00 +05:30
Prashant Singh a27bae1c2d All assets compiled for production 2019-06-13 19:08:42 +05:30
Prashant Singh 769f17a196 Fixed some syntax issue in cart rule controller 2019-06-13 19:00:33 +05:30
Prashant Singh 0aaf3d68e1 Ui package assets compiled for production 2019-06-13 18:20:09 +05:30
rahul shukla 7b14de69c6 changes in config & composer 2019-06-13 14:56:04 +05:30
rahul shukla 0fc78c5d83 Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development 2019-06-13 14:51:24 +05:30
Prashant Singh d2e8e822d7 Fixed issue #1007 2019-06-13 12:51:18 +05:30
Prashant Singh 6c0ee913ed added mass actions in admin customers grid 2019-06-13 12:47:58 +05:30
Prashant Singh 23467d9389 Added message when seller is blocked 2019-06-13 06:37:16 +05:30
Prashant Singh c86a699f69 Added status check in customer auth session creation function 2019-06-13 06:34:46 +05:30
Prashant Singh 619b8b6c8b Added status and notes in customer model fillables 2019-06-13 06:28:29 +05:30
Prashant Singh ec27ed4c8d added credit max in configuration 2019-06-13 01:05:29 +05:30
Prashant Singh 4542c96b17 Fixed issue in core regarding buynow button passing static quantity as 1 is now removed 2019-06-12 15:16:06 +05:30
Prashant Singh 76e43dcd58 added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated 2019-06-12 01:05:24 +05:30
rahul shukla 6a8c7a8784 assests compile for production 2019-06-11 16:40:13 +05:30
rahul shukla 5b1f300abf Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-11 16:22:15 +05:30
rahul shukla 1a84a016fa bulk add to cart 2019-06-11 16:22:01 +05:30
Prashant Singh 22a81efdb3 fixed issue #1011 2019-06-11 14:51:28 +05:30
Prashant Singh 6b9be23cb0 fixed issue in cart rule for add condition button and exception while updating cart rule 2019-06-11 14:38:57 +05:30
Prashant Singh de126e38ed fixed issue with cart rule disc_quantity as validation was allowing zero at the time of creation 2019-06-11 12:32:34 +05:30
Prashant Singh a7592b233d Fixed bug #1003 2019-06-11 12:26:54 +05:30
Prashant Singh 64c249983d Fixed 2019-06-10 18:28:17 +05:30
Prashant Singh 8b5ac835e0 Fixed bugs in creation of cart rule form 2019-06-10 18:26:12 +05:30
rahul shukla 8e37ebe7d5 conflict resolve 2019-06-10 17:13:30 +05:30
rahul shukla 80ac7bba72 customer document 2019-06-10 17:11:56 +05:30
Prashant Singh e20e29b0bd Fixed bug in cart rule form 2019-06-10 16:44:39 +05:30
Prashant Singh 451000c0d5 disabled customer groups from cart rules 2019-06-10 16:41:31 +05:30
Prashant Singh 0d3539f3c9 fixed validation issues in cart rule #993 & #997 2019-06-10 15:29:19 +05:30
Prashant Singh cfb16da64a fixed issue #994 2019-06-10 15:21:45 +05:30
Prashant Singh 6da603530e
Cart rule inside promotions, various improvements and fixes. (#964) 
* Some syntax issue fixes

* Adding discount things inside promotions in admin

* routes updated for creating discount rules

* fixed customer profile redirect parameter issue

* added cart and catalog rule routes to admin section

* migrations for discount almost to be finished, final revision left

* migrations for discounts complete

* catalog rule form underway

* catalog rule

* Made some dynamic form fields in catalog rule create form

* made some changes for custom validations used in ProductForm request class

* working on prepopulating the values fields in conditions

* need another revisit on discount rules tables and then prepare for actions

* removed discounts table

* catalog rule form changed to muliti attribute set for single condition

* new icons added for promotion and customer note. new action for customer added to take notes on the customers

* catalog and cart rule designs stable, now moving towards validations on client side and backend

* catalog rules migrations added

* catalog rule models added with contracts and proxies

* fixed customer group bug in customer registration controller

* fixed customer registration bug due to last fix

* fixed product card image not found issue

* catalog rule translations added

* Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them.

* making cart attributes for cart rules

* Added more fields for cart rules

* working on conditions for cart rule form

* minor changes in migrations related to price rules

* currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel

* part of conditions on the cart rule form added

* daily sync

* cart rate migrations updated

* Added select and multi select attributes options fetching with ajax on catalog rule form

* changed some migrations and data being populated at runtime inside catalog rule form

* catalog rule create complete, migrations changes, translations added

* catalog rule edit form complete

* catalog rule form complete, now moving towards catalog rule products

* added delete functionality for catalog rules

* added cart rule preferences for coupon codes

* cart rule submission problem due to repository issue

* Cart rule form and migrations complete

* Models and Repositories updated for cart rule usage

* base sync with master

* designing process to get suitable discount rules

* cart rule form completed

* added helpers in cart and discount to apply rules on cart at checkout or not

* cart rule coupon implementation in progress for discount coupon in shop checkout pages

* cart rules working

* added coupon box on checkout screen

* removed the conditions empty bug

* Nearing to completion of coupon based rules

* made some changes in cart rule coupon application on checkout related to new designs

* some bug fixes

* calculation for automatic cart rules complete

* non couponable cart rules implemented, now moving on to binding them on frontend

* some conditions improvements in couponable cart rules

* some bug fixes

* removed some bugs from summary blade for cart rule

* added the table for cart rule cart for managing rules with cart and removed various bug fixes

* some bug fixes

* Removed bugs and added coupon based cart rule removal functionality

* some bug fixes

* cart rule labels refactoring in midway

* Cart rule labels bug fixed

* removed margin classes from shop to UI

* Refactoring cart rule on front end

* added checks

* Discount rule implemented.

* cart rule bug fixes

* provision to remove the couponable and non couponable rule had been added

* Cart rule frontend work done

* altered some frontend variables on onepage checkout

* Altered cart rules to some extent
 2019-06-10 13:19:05 +05:30
jitendra 66bd3e7989 Optional index for datagrid action 2019-06-07 17:59:38 +05:30
jitendra 5585b503cf Car controller updated 2019-06-07 16:36:50 +05:30
jitendra ca4d9ef9ba Fixed js issue buy now button not exist 2019-06-07 15:42:58 +05:30
jitendra c6a44b5414 Updated cart for custom_price 2019-06-07 11:18:46 +05:30
Jitendra Singh 87542306a2
Merge pull request #980 from rahulshukla-webkul/development 
Development
 2019-06-07 11:14:43 +05:30
rahul shukla dc96dfb7b2 custom price default to null 2019-06-07 11:12:40 +05:30
rahul shukla f924e7ed01 custom price nullable in cart items 2019-06-07 10:06:00 +05:30
Jitendra Singh 9bb3c2def9
Merge pull request #977 from rahulshukla-webkul/development 
Development
 2019-06-06 17:47:37 +05:30
Jitendra Singh 796e76564c
Merge pull request #974 from imanghafoori1/clean_up_config 
clean up
 2019-06-06 17:47:10 +05:30
imanghafoori 99ccac943d fix bug 2019-06-06 16:25:06 +04:30
Jitendra Singh d399811206
Merge pull request #978 from jitendra-webkul/jitendra 
totalQuantity function added to product and product flat model
 2019-06-06 16:44:31 +05:30
jitendra 2d00679901 totalQuantity function added to product and product flat model 2019-06-06 16:43:36 +05:30
rahul shukla af67516c36 object added with event 2019-06-06 15:16:16 +05:30
rahul shukla b7b42ffc15 translation updated 2019-06-04 18:25:54 +05:30
rahul shukla 255664c4c0 back button implemented on checkout page 2019-06-04 16:36:42 +05:30
imanghafoori 9f039cb9a5 clean up 
- optimized imports
- remove unused variable
- extract a method
- flatten code
 2019-06-04 14:45:16 +04:30
Jitendra Singh 68e01e85c2
Merge pull request #971 from imanghafoori1/clean_up_dashboard 
Clean up
 2019-06-04 14:21:19 +05:30
rahul shukla d232722b5d issue #916 2019-06-04 12:49:10 +05:30
rahul shukla 40e8c85813 issue #945 product image of variant 2019-06-04 10:17:00 +05:30
imanghafoori e0dd74c06c clean up 2019-06-04 00:52:37 +04:30
rahul shukla 93324e021e issue #896 product special price 2019-06-03 17:11:11 +05:30
rahul shukla fc456c785f issue #850 2019-06-03 16:29:00 +05:30
Jitendra Singh 4ed068b00b
Merge pull request #967 from jitendra-webkul/jitendra 
Fixed mini cart layout
 2019-05-31 18:31:41 +05:30
jitendra 96e8556b54 Fixed mini cart layout 2019-05-31 18:30:09 +05:30
Jitendra Singh fa87ecab3d
Merge pull request #966 from jitendra-webkul/jitendra 
Issue #932 fixed
 2019-05-31 17:54:26 +05:30
jitendra 8202f58284 Issue #932 fixed 2019-05-31 17:52:52 +05:30
Jitendra Singh 746d7e5204
Merge pull request #965 from rahulshukla-webkul/development 
Development
 2019-05-31 13:20:27 +05:30
rahul shukla 12e93b3f58 cart updated for convert price 2019-05-31 12:48:04 +05:30
jitendra 445b648b0a Issues #948, #949 fixed 2019-05-30 18:32:01 +05:30
Jitendra Singh 49d8388d49
Merge pull request #962 from rahulshukla-webkul/development 
UI fixes for project
 2019-05-30 13:25:59 +05:30
rahul shukla 3663391bf6 UI fixes for project 2019-05-30 11:52:06 +05:30
Jitendra Singh 219b9fae03
Merge pull request #960 from rahulshukla-webkul/development 
channel added for payment & shiping method's status
 2019-05-29 14:29:32 +05:30
rahul shukla 6804deae76 channel added for payment & shiping method's status 2019-05-29 13:31:53 +05:30
Jitendra Singh ef2f9659f4
Merge pull request #959 from rahulshukla-webkul/development 
configuration added to admin logo
 2019-05-29 12:45:08 +05:30
rahul shukla 573df3818c configuration added to admin logo 2019-05-29 12:42:18 +05:30
Jitendra Singh 3cec2d1935
Merge pull request #958 from rahulshukla-webkul/development 
Development
 2019-05-29 11:48:55 +05:30
rahul shukla d1199a6f26 issue #956 2019-05-29 11:35:17 +05:30
rahul shukla fe8ac5abf1 issue #957 change in event 2019-05-29 09:56:28 +05:30
Jitendra Singh eee546da6a
Merge pull request #955 from rahulshukla-webkul/development 
Development
 2019-05-28 17:06:25 +05:30
rahul shukla 7281cfeb78 issue #922 2019-05-28 13:32:13 +05:30
rahul shukla b5eff8b47e issue #942 2019-05-27 18:25:30 +05:30
rahul shukla c4a9d04e72 file & image attribute 2019-05-27 16:51:27 +05:30
jitendra 37ba923e9e Backorder implemented 2019-05-24 18:45:47 +05:30
Jitendra Singh d7c2ef3e6d
Merge pull request #944 from rahulshukla-webkul/development 
Development
 2019-05-24 17:18:17 +05:30
rahul shukla b8561d4d5e schema condition in product flat table 2019-05-24 12:15:30 +05:30
rahul shukla 308b3be1d8 installer file deletion after install 2019-05-24 11:53:11 +05:30
rahul shukla 7efcdefc6a changes in prouduct flat new migration 2019-05-23 18:49:29 +05:30
jitendra fb394d974c Discount calculation added to the cart and discount added to the sales views 2019-05-23 18:44:16 +05:30
jitendra edec481f26 Sales discount calculation implemented 2019-05-23 17:00:11 +05:30
rahul shukla de5952bc36 issue #939 2019-05-23 13:06:31 +05:30
rahul shukla 8678a865f0 column added in product flat table 2019-05-23 12:10:02 +05:30
rahul shukla 2d85b90e81 weight unit added in configuration 2019-05-22 19:40:36 +05:30
rahul shukla 27812ccd15 shipping title & footer text 2019-05-22 18:45:47 +05:30
rahul shukla 5c6708c975 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-22 18:14:57 +05:30
rahul shukla f434024827 change datatype of post code 2019-05-22 17:03:48 +05:30
shaiv-webkul acfdd0f880 config field for password 2019-05-22 16:11:45 +05:30
Jitendra Singh 698f7da6da
Merge pull request #930 from rahulshukla-webkul/development 
issue #917 & #923
 2019-05-22 12:10:32 +05:30
rahul shukla 7888656d4c down icon & product edit icon 2019-05-21 20:11:36 +05:30
rahul shukla 30942b3d25 product page changes 2019-05-21 19:36:20 +05:30
rahul shukla 84b60e9081 comment of phone field in customer 2019-05-21 18:07:54 +05:30
Jitendra Singh d965e10e4b
Merge pull request #931 from jitendra-webkul/jitendra 
Api added for address delete
 2019-05-21 13:04:37 +05:30
jitendra 64fde804b4 Api added for address delete 2019-05-21 13:03:50 +05:30
rahul shukla 568e6ff7c8 change for group 2019-05-21 12:46:43 +05:30
rahul shukla 898214e81e issue #925 2019-05-21 12:00:43 +05:30
rahul shukla 2d782cab79 issue #917 & #923 2019-05-21 10:51:39 +05:30
rahul shukla f05d07eb38 issue #913 group in attribute family 2019-05-20 16:22:53 +05:30
jitendra afb0b99723 Email sent option added in mail notification 2019-05-17 16:05:30 +05:30
jitendra 7931baab28 Email sent option added in mail notification 2019-05-17 15:31:39 +05:30
prateek srivastava 39ae415148 admin Navigation bar menu scroll issue fixed 2019-05-10 11:34:25 +05:30
Jitendra Singh 4455ce6849
Merge pull request #912 from jitendra-webkul/jitendra 
Refactored ProductController
 2019-05-09 16:50:45 +05:30
jitendra 165e6aef5b Refactored ProductController 2019-05-09 16:49:52 +05:30
Jitendra Singh 05d3870b06
Merge pull request #911 from jitendra-webkul/jitendra 
Added url_key to product api
 2019-05-09 13:25:50 +05:30
jitendra 845a6c7f18 Added url_key to product api 2019-05-09 13:24:52 +05:30
Jitendra Singh 6e3769a95e
Merge pull request #910 from rahulshukla-webkul/development 
icon issue in layred navigation #issue 903
 2019-05-09 12:32:55 +05:30
rahul shukla ce99a4d9bb icon issue in layred navigation #issue 903 2019-05-09 12:28:48 +05:30
Jitendra Singh 2a4e6a619b
Merge pull request #909 from jitendra-webkul/jitendra 
Api add to cart error message issue fixed
 2019-05-09 12:05:18 +05:30
jitendra a9a069f366 Api add to cart error message issue fixed 2019-05-09 12:04:41 +05:30
rahul shukla d31179edaa removal of space 2019-05-09 11:38:34 +05:30
rahul shukla ae8a4dae61 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-09 11:36:51 +05:30
rahul shukla 4c2a895b08 Issue #897 & change in valdation message for category image 2019-05-09 11:36:21 +05:30
Jitendra Singh 55c083ae1e
Merge pull request #907 from jitendra-webkul/jitendra 
Added api for forgot password
 2019-05-08 18:57:25 +05:30
jitendra 16220c656f Added api for forgot password 2019-05-08 18:56:28 +05:30
rahul shukla 3486983b1d IE completed & redirect customer route 2019-05-08 17:52:54 +05:30
rahul shukla 6f494cc04b IE changes 2019-05-07 21:09:27 +05:30
rahul shukla e2120ea276 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-07 18:57:55 +05:30
rahul shukla b52dc978e8 Admin section for IE & dyanamic footer content 2019-05-07 18:57:33 +05:30
jitendra 0ff492ae80 Fixed product repository search index issue 2019-05-07 17:54:43 +05:30
jitendra a72d054cb5 Added api for front shop 2019-05-07 17:06:21 +05:30
rahul shukla b4a95b8d0c cart pages changes 2019-05-06 21:15:26 +05:30
rahul shukla 1b3653348d front end changes for IE 2019-05-06 20:52:43 +05:30
rahul shukla 87b732898d add & remove at cart page 2019-05-06 13:06:16 +05:30
Jitendra Singh af8705d8e8
Merge pull request #900 from shenjiayu/development 
utilise Mail::queue to send emails
 2019-05-02 16:52:54 +05:30
jitendra 6b237b775d Fixed payment class conflict 2019-05-02 11:00:02 +05:30
jitendra 6121e5eefe Added getPaymentMethods in Payment 2019-05-02 10:55:59 +05:30
Jiayu Shen 2816dd01e5
Merge branch 'master' into development 2019-05-01 22:38:42 +10:00
Jitendra Singh 52bc554e31
Merge pull request #895 from prateek-webkul/development 
admin mail notification, review price
 2019-05-01 17:58:12 +05:30
shenjiayu 8eea13db2d utilise Mail::queue to send emails 2019-05-01 21:31:03 +10:00
rahul shukla f942415ebb sort order for payment methods 2019-04-30 19:02:56 +05:30
rahul shukla db56e4b2df issue #814 2019-04-30 17:53:59 +05:30