Skip to content
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

Merged
merged 160 commits into from
Jan 16, 2025

Conversation

ScuffedNewt
Copy link
Contributor

@ScuffedNewt ScuffedNewt commented Jan 2, 2025

Closes #1094

mostly because i need countAssets for another dev feature lol

I 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:

  • credits need to be added on credits page instead of extension config

some things that should be tested (by people other than me):

  • one-time purchases
  • different cost options
  • coupons on diff stock
  • restocking / random stock
  • limited_stock_coupon_settings

@SpeedyD
Copy link
Contributor

SpeedyD commented Jan 5, 2025

Anyway @ScuffedNewt, I want to approve this but I'm awaiting your final todo

credits need to be added on credits page instead of extension config

Unless you already did this and I missed it..?

Copy link
Collaborator

@itinerare itinerare left a 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!

@ScuffedNewt
Copy link
Contributor Author

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

Copy link
Contributor

@SpeedyD SpeedyD left a 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. :)

@ScuffedNewt
Copy link
Contributor Author

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

Copy link
Contributor

@SpeedyD SpeedyD left a 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
@ScuffedNewt
Copy link
Contributor Author

please have a proper test on local, have a
production.ERROR: Attempt to read property "id" on null {"userId":N,"exception":"[object] (ErrorException(code: 0): Attempt to read property \"id\" on null at www/app/Models/Shop/ShopLog.php:147
on a site but not sure if this is due to other reasons

@itinerare
Copy link
Collaborator

I'll see if I can give it a look (maybe tomorrow?)...

app/Models/Item/Item.php Outdated Show resolved Hide resolved
app/Models/Item/Item.php Outdated Show resolved Hide resolved
@itinerare itinerare added reviewed Pull requests that have received community review and are pending merge and removed needs review Pull requests that are pending community review labels Jan 16, 2025
@itinerare itinerare merged commit ca359d6 into corowne:develop Jan 16, 2025
3 checks passed
@itinerare itinerare linked an issue Jan 24, 2025 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request reviewed Pull requests that have received community review and are pending merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shop Features on Develop?
4 participants