-
Notifications
You must be signed in to change notification settings - Fork 133
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feat(shop): Merge "Shop Features" into develop #1172
Feat(shop): Merge "Shop Features" into develop #1172
Conversation
…rekeeper into extension/shop-features # Conflicts: # app/Services/ShopService.php # resources/views/shops/_stock_modal.blade.php
# Conflicts: # app/Services/ShopManager.php
Anyway @ScuffedNewt, I want to approve this but I'm awaiting your final todo
Unless you already did this and I missed it..? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good-- just put the example .env back and make those credits changes, please!
the coupon issues mentioned in dms apply to old logs and are not easily fixable since the logs dd not track the usage of coupons |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Glad you put in proper crediting, but you forgot to remove the config/lorekeeper/ext-tracker/shop_features.php file. :)
i will make a pr after since this is on the actual extension branch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Glad you put in proper crediting, but you forgot to remove the config/lorekeeper/ext-tracker/shop_features.php file. :)
i will make a pr after since this is on the actual extension branch
I'll hold you to that.
…extension/shop-features # Conflicts: # app/Http/Controllers/WorldController.php # resources/views/world/items.blade.php
please have a proper test on local, have a |
I'll see if I can give it a look (maybe tomorrow?)... |
…ewt/lorekeeper into extension/shop-features # Conflicts: # app/Models/Item/Item.php
Closes #1094
mostly because i need
countAssets
for another dev feature lolI don't think this is missing any features, but feel free to correct me if there is anything that should be added and isn't currently a feature, since like I said this extension will probably be fairly immutable once merged
to-do:
some things that should be tested (by people other than me):