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.

Sign up for GitHub

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

Jump to bottom

[0.2] Hotfix - Brand url generation #862

Merged
merged 15 commits into from
Feb 15, 2023
Merged

[0.2] Hotfix - Brand url generation #862

merged 15 commits into from
Feb 15, 2023

Conversation

wychoong
Copy link
Contributor

closes #860

alecritson and others added 8 commits February 10, 2023 13:27
@alecritson
Squashed commit of the following:
10ac7aa 
commit 02c2671
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Fri Feb 10 11:13:49 2023 +0000

    Update lines.blade.php (lunarphp#849)

commit 0780a1c
Author: wychoong <67364036+wychoong@users.noreply.github.com>
Date:   Fri Feb 10 18:41:36 2023 +0800

    Update CollectionTree.php (lunarphp#835)

    Co-authored-by: Alec Ritson <hello@itsalec.co.uk>

commit e558799
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Fri Feb 10 09:47:16 2023 +0000

    :beer:

commit 8fd4842
Merge: df6f7f7 51af420
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Fri Feb 10 09:47:03 2023 +0000

    Merge branch '0.2' of github.com:lunarphp/lunar into 0.2

commit df6f7f7
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Fri Feb 10 09:47:00 2023 +0000

    :beer:

commit 51af420
Author: wychoong <67364036+wychoong@users.noreply.github.com>
Date:   Fri Feb 10 17:43:10 2023 +0800

    [0.2] Hotfix - fix pluck on null (lunarphp#834)

    * fix pluck on null

    * Update AbstractDiscount.php

    ---------

    Co-authored-by: Alec Ritson <hello@itsalec.co.uk>

commit 7b5ce85
Author: wychoong <67364036+wychoong@users.noreply.github.com>
Date:   Fri Feb 10 17:16:50 2023 +0800

    [0.2] Fix/discount by product (lunarphp#841)

    * fix

    * add test

    * fix discount minSpend precision

    * fix discount condition logic

    * fix

    * fix coupon check

commit 72f8454
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Fri Feb 10 09:16:16 2023 +0000

    Hotfix [0.2] - Wrap customer group in array (lunarphp#846)

    * Wrap customer group in array

    * Update ProductVariantTest.php

commit b8773d3
Author: Ryan Mitchell <ryan@thoughtcollective.com>
Date:   Wed Feb 8 20:43:09 2023 +0000

    When DB::table() is used make sure connection is passed (lunarphp#826)

commit 650d9db
Merge: dcd39cc de20aff
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Wed Feb 1 09:57:04 2023 +0000

    Merge branch 'main' into 0.2

commit dcd39cc
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Tue Jan 31 07:29:15 2023 +0000

    :beer:
@alecritson
Merge branch '0.2'
492234b
@alecritson
Squashed commit of the following:
06eb5f7 
commit 1a362cc
Author: Ivanka Todorova <1038697+fakeheal@users.noreply.github.com>
Date:   Tue Feb 14 13:25:25 2023 +0200

    Fix validation of attributes of type TranslatedText (lunarphp#839)

    * fix: validation rules to be applied on elements in `TranslatedText`

    * fix: "reset" the validation rules applied to each sub-field in `TranslatedText`

    * chore: add tests for validating attribute fields (required/optional) and their additional rules

    ---------

    Co-authored-by: Alec Ritson <hello@itsalec.co.uk>

commit 6c1ab08
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Tue Feb 14 10:58:15 2023 +0000

    [0.2] Hotfix - Fix collection name on creation (lunarphp#852)

    * Squashed commit of the following:

    commit 02c2671
    Author: Alec Ritson <hello@itsalec.co.uk>
    Date:   Fri Feb 10 11:13:49 2023 +0000

        Update lines.blade.php (lunarphp#849)

    commit 0780a1c
    Author: wychoong <67364036+wychoong@users.noreply.github.com>
    Date:   Fri Feb 10 18:41:36 2023 +0800

        Update CollectionTree.php (lunarphp#835)

        Co-authored-by: Alec Ritson <hello@itsalec.co.uk>

    commit e558799
    Author: Alec Ritson <hello@itsalec.co.uk>
    Date:   Fri Feb 10 09:47:16 2023 +0000

        :beer:

    commit 8fd4842
    Merge: df6f7f7 51af420
    Author: Alec Ritson <hello@itsalec.co.uk>
    Date:   Fri Feb 10 09:47:03 2023 +0000

        Merge branch '0.2' of github.com:lunarphp/lunar into 0.2

    commit df6f7f7
    Author: Alec Ritson <hello@itsalec.co.uk>
    Date:   Fri Feb 10 09:47:00 2023 +0000

        :beer:

    commit 51af420
    Author: wychoong <67364036+wychoong@users.noreply.github.com>
    Date:   Fri Feb 10 17:43:10 2023 +0800

        [0.2] Hotfix - fix pluck on null (lunarphp#834)

        * fix pluck on null

        * Update AbstractDiscount.php

        ---------

        Co-authored-by: Alec Ritson <hello@itsalec.co.uk>

    commit 7b5ce85
    Author: wychoong <67364036+wychoong@users.noreply.github.com>
    Date:   Fri Feb 10 17:16:50 2023 +0800

        [0.2] Fix/discount by product (lunarphp#841)

        * fix

        * add test

        * fix discount minSpend precision

        * fix discount condition logic

        * fix

        * fix coupon check

    commit 72f8454
    Author: Alec Ritson <hello@itsalec.co.uk>
    Date:   Fri Feb 10 09:16:16 2023 +0000

        Hotfix [0.2] - Wrap customer group in array (lunarphp#846)

        * Wrap customer group in array

        * Update ProductVariantTest.php

    commit b8773d3
    Author: Ryan Mitchell <ryan@thoughtcollective.com>
    Date:   Wed Feb 8 20:43:09 2023 +0000

        When DB::table() is used make sure connection is passed (lunarphp#826)

    commit 650d9db
    Merge: dcd39cc de20aff
    Author: Alec Ritson <hello@itsalec.co.uk>
    Date:   Wed Feb 1 09:57:04 2023 +0000

        Merge branch 'main' into 0.2

    commit dcd39cc
    Author: Alec Ritson <hello@itsalec.co.uk>
    Date:   Tue Jan 31 07:29:15 2023 +0000

        :beer:

    * Check for attribute type when creating

commit 0942397
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Tue Feb 14 10:57:37 2023 +0000

    Update HasImages.php (lunarphp#853)
@alecritson
Merge branch '0.2'
7b215e2
@wychoong
add test
244c0ca
@wychoong
enhance url generator to handle non attribute_data
c06aabc
@wychoong
phpunit warning: expectWarningMessage deprecated
e145dc4
@wychoong
cleanup
edb8995
@vercel
Copy link

vercel bot commented Feb 15, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated
lunar-docs ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Feb 15, 2023 at 2:20PM (UTC)

@wychoong
Copy link
Contributor Author

hey @alecritson i didn't notice you already merged in the fix. should i close this or merge and keep the other changes?

@alecritson
Copy link
Collaborator

@wychoong No problem, I think the other changes are worthwhile so i'd be happy for them to be kept.

@alecritson alecritson changed the title Fix/brand url generation [0.2] Hotfix - Brand url generation Feb 15, 2023
@wychoong wychoong force-pushed the fix/brand-url-generation branch from 115a8a8 to c0b387d Compare February 15, 2023 14:16
@wychoong
Copy link
Contributor Author

@alecritson done :)

@alecritson alecritson merged commit fab3b6d into lunarphp:0.2 Feb 15, 2023
@wychoong wychoong deleted the fix/brand-url-generation branch February 15, 2023 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alecritson alecritson alecritson approved these changes

@glennjacobs glennjacobs glennjacobs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wychoong @alecritson @glennjacobs