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

Introduce Products #239

Merged
merged 24 commits into from
Nov 4, 2024
Merged

Introduce Products #239

merged 24 commits into from
Nov 4, 2024

Commits on Sep 20, 2024

  1. Rename tickets to products

    @daveearley
    daveearley committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7379276 View commit details
    Browse the repository at this point in the history

  2. Update config and tests

    @daveearley
    daveearley committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    e3b5a72 View commit details
    Browse the repository at this point in the history

  3. Update ticket creation form

    @daveearley
    daveearley committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    8871867 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Merge branch 'develop' into add-products 

    # Conflicts:
#	backend/app/DomainObjects/ProductDomainObject.php
#	backend/app/Services/Handlers/Order/CompleteOrderHandler.php
#	frontend/src/components/routes/product-widget/SelectProducts/Prices/Tiered/index.tsx
#	frontend/src/components/routes/product-widget/SelectProducts/index.tsx
#	frontend/src/locales/de.js
#	frontend/src/locales/de.po
#	frontend/src/locales/en.js
#	frontend/src/locales/en.po
#	frontend/src/locales/es.js
#	frontend/src/locales/es.po
#	frontend/src/locales/fr.js
#	frontend/src/locales/fr.po
#	frontend/src/locales/pt-br.js
#	frontend/src/locales/pt-br.po
#	frontend/src/locales/pt.js
#	frontend/src/locales/pt.po
#	frontend/src/locales/ru.js
#	frontend/src/locales/ru.po
#	frontend/src/locales/zh-cn.js
#	frontend/src/locales/zh-cn.po
    @daveearley
    daveearley committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    d007041 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. continued work on migration from tickets to products

    @daveearley
    daveearley committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    3a671d0 View commit details
    Browse the repository at this point in the history

  2. continued work on migration from tickets to products

    @daveearley
    daveearley committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    d64d11f View commit details
    Browse the repository at this point in the history

  3. Various semantic changes in email text, footer, and changes event pag… 

    …e title to end with organizer name
    @grablair
    grablair committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    e1c9cf3 View commit details
    Browse the repository at this point in the history

  4. Allow the header of emails to link to a webpage other than the app URL

    @grablair
    grablair committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    bb0eb59 View commit details
    Browse the repository at this point in the history

  5. Fix app name variable

    @grablair
    grablair committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    f2ce929 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Merge pull request #263 from grablair/feat/email-logo-link-configuration

    @daveearley
    daveearley authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    791dbde View commit details
    Browse the repository at this point in the history

  2. Merge pull request #262 from grablair/fix/semantic-changes

    @daveearley
    daveearley authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    e05cd1d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into add-products 

    # Conflicts:
#	backend/app/DomainObjects/Generated/ProductDomainObjectAbstract.php
#	backend/app/Services/Domain/Ticket/CreateTicketService.php
#	backend/app/Services/Handlers/Ticket/CreateTicketHandler.php
#	backend/app/Services/Handlers/Ticket/DTO/UpsertTicketDTO.php
#	backend/app/Services/Handlers/Ticket/EditTicketHandler.php
#	frontend/src/components/forms/ProductForm/index.tsx
#	frontend/src/components/modals/CreateTicketModal/index.tsx
#	frontend/src/components/modals/EditProductModal/index.tsx
#	frontend/src/components/routes/product-widget/AttendeeProductAndInformation/index.tsx
#	frontend/src/components/routes/product-widget/PrintProduct/index.tsx
#	frontend/src/components/routes/product-widget/SelectProducts/index.tsx
#	frontend/src/locales/de.js
#	frontend/src/locales/de.po
#	frontend/src/locales/en.js
#	frontend/src/locales/en.po
#	frontend/src/locales/es.js
#	frontend/src/locales/es.po
#	frontend/src/locales/fr.js
#	frontend/src/locales/fr.po
#	frontend/src/locales/pt-br.js
#	frontend/src/locales/pt-br.po
#	frontend/src/locales/pt.js
#	frontend/src/locales/pt.po
#	frontend/src/locales/ru.js
#	frontend/src/locales/ru.po
#	frontend/src/locales/zh-cn.js
#	frontend/src/locales/zh-cn.po
#	frontend/src/styles/widget/default.scss
    @daveearley
    daveearley committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    fcca120 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. Start work on responsive colors for QR code scans

    @grablair
    grablair committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    35c5d5d View commit details
    Browse the repository at this point in the history

  2. Modify colors, add in-progress

    @grablair
    grablair committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    eef5657 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Update sorting logic for tickets. Continue work on product migration

    @daveearley
    daveearley committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    b45e09b View commit details
    Browse the repository at this point in the history

  2. type fix

    @daveearley
    daveearley committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    60eb4db View commit details
    Browse the repository at this point in the history

  3. Merge pull request #269 from grablair/feat/qr-scan-response-improvements

    @daveearley
    daveearley authored Oct 28, 2024
    Configuration menu
    Copy the full SHA
    fd7d28f View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Fix all-in-one Docker setup

    @daveearley
    daveearley committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    8fdd298 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #271 from HiEventsDev/fix-all-in-one-docker-setup

    @daveearley
    daveearley authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    c85050a View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge branch 'develop' into add-products 

    # Conflicts:
#	frontend/src/components/common/AttendeeCheckInTable/QrScanner.tsx
#	frontend/src/components/common/AttendeeCheckInTable/index.tsx
    @daveearley
    daveearley committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    8a621ec View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Update tests and order and attendee modals

    @daveearley
    daveearley committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    c71df0c View commit details
    Browse the repository at this point in the history

  2. Update testHandleUpdatesProductQuantitiesForFreeOrder

    @daveearley
    daveearley committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    05df93e View commit details
    Browse the repository at this point in the history

  3. Update testHandleDoesNotUpdateProductQuantitiesForPaidOrder

    @daveearley
    daveearley committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    204f118 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Update attendees modals/forms

    @daveearley
    daveearley committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    18862b1 View commit details
    Browse the repository at this point in the history