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

app: Allow for auto-accepting of orders for specific restaurants #1736

Merged
merged 76 commits into from
Jul 2, 2024
Merged

app: Allow for auto-accepting of orders for specific restaurants #1736

merged 76 commits into from
Jul 2, 2024

Commits on Apr 1, 2024

  1. re-format: src/navigation/restaurant

    @vladimir-8
    vladimir-8 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    6046dfb View commit details
    Browse the repository at this point in the history

  2. re-format: RestaurantNavigator

    @vladimir-8
    vladimir-8 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    ae9114f View commit details
    Browse the repository at this point in the history

  3. re-format: NotificationHandler

    @vladimir-8
    vladimir-8 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    10fda65 View commit details
    Browse the repository at this point in the history

  4. refactored dashboard using function components

    @vladimir-8
    vladimir-8 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    af929da View commit details
    Browse the repository at this point in the history

  5. added: in preparation and ready sections

    @vladimir-8
    vladimir-8 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    a23c575 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. hide new orders section for the restaurants with autoAcceptOrdersEnabled

    @vladimir-8
    vladimir-8 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    db48626 View commit details
    Browse the repository at this point in the history

  2. extracted OrderItem

    @vladimir-8
    vladimir-8 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    b11960a View commit details
    Browse the repository at this point in the history

  3. WIP; green button to move order to the next state

    @vladimir-8
    vladimir-8 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    f042532 View commit details
    Browse the repository at this point in the history

  4. green button to move order to the next state

    @vladimir-8
    vladimir-8 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    7b75509 View commit details
    Browse the repository at this point in the history

  5. renamed model -> domain

    @vladimir-8
    vladimir-8 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    78f1a3a View commit details
    Browse the repository at this point in the history

  6. use new 'order:state_changed' event to get order updates

    @vladimir-8
    vladimir-8 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    c8b59d6 View commit details
    Browse the repository at this point in the history

  7. fixed: section header background

    @vladimir-8
    vladimir-8 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    4417e36 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. refactor NotificationHandler

    @vladimir-8
    vladimir-8 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9f1a722 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Merge branch 'master' into feature/1707-auto-accept

    @vladimir-8
    vladimir-8 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    2e1aaea View commit details
    Browse the repository at this point in the history

  2. fixed: import

    @vladimir-8
    vladimir-8 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4074243 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. ui fix; left margin

    @vladimir-8
    vladimir-8 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    f78b385 View commit details
    Browse the repository at this point in the history

  2. added: event constants

    @vladimir-8
    vladimir-8 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    6ce56a8 View commit details
    Browse the repository at this point in the history

  3. changed: remove pop-up when a new order is autoaccepted (restaurant.a… 

    …utoAcceptOrdersEnabled), but the "ding" sound does remain
    @vladimir-8
    vladimir-8 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    21cf544 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Merge branch 'master' into feature/1707-auto-accept

    @vladimir-8
    vladimir-8 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    81b8bde View commit details
    Browse the repository at this point in the history

  2. fixed: handle tasks:changed push notification on android while the ap… 

    …p is in the foreground
    @vladimir-8
    vladimir-8 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    238b8e2 View commit details
    Browse the repository at this point in the history

  3. fixed: wrong param

    @vladimir-8
    vladimir-8 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    f7a2dee View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. added: a separate redux action for foreground notifications

    @vladimir-8
    vladimir-8 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    123f91e View commit details
    Browse the repository at this point in the history

  2. improved debug tools; print redux store states and diff

    @vladimir-8
    vladimir-8 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    7dc72db View commit details
    Browse the repository at this point in the history

  3. fixed: low volume alert is shown twice

    @vladimir-8
    vladimir-8 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    86c2f7f View commit details
    Browse the repository at this point in the history

  4. fixed: do not re-send the token if it does not change

    @vladimir-8
    vladimir-8 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    1767230 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. added: When these orders are accepted automatically it also automatic… 

    …ally prints a ticket if a printer is connected
    @vladimir-8
    vladimir-8 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    bd51a57 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. fixed: unnecessary usePushNotification updates

    @vladimir-8
    vladimir-8 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    4acab7c View commit details
    Browse the repository at this point in the history

  2. fixed: disconnect centrifuge on logout

    @vladimir-8
    vladimir-8 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d283a03 View commit details
    Browse the repository at this point in the history

  3. fixed: #929

    @vladimir-8
    vladimir-8 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    fe65010 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Merge branch 'master' into code-styly-restaurant-part 

    # Conflicts:
#	src/components/NotificationHandler.js
#	src/navigation/navigators/RestaurantNavigator.js
#	src/navigation/restaurant/Dashboard.js
#	src/navigation/restaurant/Date.js
#	src/navigation/restaurant/List.js
#	src/navigation/restaurant/LoopeatFormats.js
#	src/navigation/restaurant/Menus.js
#	src/navigation/restaurant/OpeningHours.js
#	src/navigation/restaurant/Order.js
#	src/navigation/restaurant/OrderCancel.js
#	src/navigation/restaurant/OrderDelay.js
#	src/navigation/restaurant/OrderRefuse.js
#	src/navigation/restaurant/Printer.js
#	src/navigation/restaurant/ProductOptions.js
#	src/navigation/restaurant/Products.js
#	src/navigation/restaurant/Settings.js
#	src/navigation/restaurant/SettingsNavigator.js
#	src/navigation/restaurant/components/BigButton.js
#	src/navigation/restaurant/components/DatePickerHeader.js
#	src/navigation/restaurant/components/HeaderRight.js
#	src/navigation/restaurant/components/OrderAcceptedFooter.js
#	src/navigation/restaurant/components/OrderButtons.js
#	src/navigation/restaurant/components/OrderHeading.js
#	src/navigation/restaurant/components/OrderList.js
#	src/navigation/restaurant/components/SwipeToAcceptOrRefuse.js
#	src/navigation/restaurant/components/WebSocketIndicator.js
    @vladimir-8
    vladimir-8 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a91c2cb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'code-styly-restaurant-part' into feature/1707-auto-accept 

    # Conflicts:
#	src/components/NotificationHandler.js
#	src/navigation/restaurant/Dashboard.js
#	src/navigation/restaurant/components/OrderList.js
#	src/notifications/index.android.js
#	src/redux/App/actions.js
#	src/redux/App/reducers.js
#	src/redux/App/selectors.js
#	src/redux/Courier/taskActions.js
#	src/redux/Courier/taskEntityReducer.js
#	src/redux/Courier/taskMiddlewares.js
#	src/redux/Restaurant/__tests__/middlewares.test.js
#	src/redux/Restaurant/actions.js
#	src/redux/Restaurant/middlewares.js
#	src/redux/Restaurant/reducers.js
#	src/redux/Restaurant/selectors.js
#	src/redux/middlewares/CentrifugoMiddleware/actions.js
#	src/redux/middlewares/CentrifugoMiddleware/index.js
#	src/redux/store.js
    @vladimir-8
    vladimir-8 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    5297638 View commit details
    Browse the repository at this point in the history

  3. (re) applied prettier rules

    @vladimir-8
    vladimir-8 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    05a8dad View commit details
    Browse the repository at this point in the history

  4. configure push notifications in redux middleware

    @vladimir-8
    vladimir-8 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    8f68f2c View commit details
    Browse the repository at this point in the history

  5. deleted empty files

    @vladimir-8
    vladimir-8 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    99e14d1 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. import createAction from redux/toolkit

    @vladimir-8
    vladimir-8 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    69b2198 View commit details
    Browse the repository at this point in the history

  2. moved isFetching inside init block

    @vladimir-8
    vladimir-8 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    84ed7c1 View commit details
    Browse the repository at this point in the history

  3. manage sound inside redux middleware

    @vladimir-8
    vladimir-8 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    d977c9a View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. put back 'rindOnOrderCreated' middleware

    @vladimir-8
    vladimir-8 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    21ba9b6 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge branch 'master' into feature/1707-auto-accept 

    # Conflicts:
#	src/redux/App/actions.js
#	src/redux/App/selectors.js
#	src/redux/Courier/taskActions.js
    @vladimir-8
    vladimir-8 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    8283167 View commit details
    Browse the repository at this point in the history

  2. bump version code

    @vladimir-8
    vladimir-8 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    c58d342 View commit details
    Browse the repository at this point in the history

  3. added: display buildVersion

    @vladimir-8
    vladimir-8 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    08291f0 View commit details
    Browse the repository at this point in the history

  4. bump version code

    @vladimir-8
    vladimir-8 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    7e916c0 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. (temporary) disable instance (workflow inputs limit)

    @vladimir-8
    vladimir-8 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    e7abc3c View commit details
    Browse the repository at this point in the history

  2. changed: checkout tag instead of a branch

    @vladimir-8
    vladimir-8 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    22250d4 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. fixed: filter for the Picked orders section

    @vladimir-8
    vladimir-8 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    7dc9050 View commit details
    Browse the repository at this point in the history

  2. display Cancel and Delay buttons in the In preparation and Ready states

    @vladimir-8
    vladimir-8 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    35d2710 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. display if an order has been printed next to the list item

    @vladimir-8
    vladimir-8 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    3e7105b View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. fixed: moved orders to the Picked column no matter what the state is

    @vladimir-8
    vladimir-8 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    f405fd1 View commit details
    Browse the repository at this point in the history

  2. Temporarily display new sections only for restaurants with auto accep… 

    …t orders enabled
    @vladimir-8
    vladimir-8 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    b6bfebf View commit details
    Browse the repository at this point in the history

  3. refactoring: use function component

    @vladimir-8
    vladimir-8 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    7e47486 View commit details
    Browse the repository at this point in the history

  4. added: configure number of copies printed

    @vladimir-8
    vladimir-8 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    9b7fac3 View commit details
    Browse the repository at this point in the history

  5. bump version code

    @vladimir-8
    vladimir-8 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    b13a9a3 View commit details
    Browse the repository at this point in the history

  6. changed: upload to internal track by default

    @vladimir-8
    vladimir-8 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    1219ada View commit details
    Browse the repository at this point in the history

  7. updated description

    @vladimir-8
    vladimir-8 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    e28bb85 View commit details
    Browse the repository at this point in the history

  8. updated description

    @vladimir-8
    vladimir-8 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2e7b3a6 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. changed: don't upload to Google Play by default

    @vladimir-8
    vladimir-8 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    968b942 View commit details
    Browse the repository at this point in the history

  2. changed: allow to build iOS app from a specific tag

    @vladimir-8
    vladimir-8 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    e2e32a1 View commit details
    Browse the repository at this point in the history

  3. updated: command name

    @vladimir-8
    vladimir-8 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    bf97cb2 View commit details
    Browse the repository at this point in the history

  4. updated: command names

    @vladimir-8
    vladimir-8 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    a8fa8f7 View commit details
    Browse the repository at this point in the history

  5. updated: command names

    @vladimir-8
    vladimir-8 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    e65c0a7 View commit details
    Browse the repository at this point in the history

  6. WIP: iOS beta app setup

    @vladimir-8
    vladimir-8 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    16da72d View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. added: customise build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    c94951b View commit details
    Browse the repository at this point in the history

  2. fixed: customise build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    55d1936 View commit details
    Browse the repository at this point in the history

  3. WIP: customise build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    3f88840 View commit details
    Browse the repository at this point in the history

  4. fixed: customise build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    37cfe7c View commit details
    Browse the repository at this point in the history

  5. fixed: customise build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    326369d View commit details
    Browse the repository at this point in the history

  6. fixed: customise build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    2a29b25 View commit details
    Browse the repository at this point in the history

  7. changed: build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    738764b View commit details
    Browse the repository at this point in the history

  8. changed: build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    531fcd3 View commit details
    Browse the repository at this point in the history

  9. added: customise build run name

    @vladimir-8
    vladimir-8 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    e0578ea View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. put back 'redux-actions's createAction for events using legacy style

    @vladimir-8
    vladimir-8 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    5fb4ede View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Merge branch 'master' into feature/1707-auto-accept 

    # Conflicts:
#	.github/workflows/build_android.yml
#	android/app/build.gradle
#	ios/CoopCycle/Info.plist
    @vladimir-8
    vladimir-8 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    31659fb View commit details
    Browse the repository at this point in the history

  2. added: update task list on the foreground notification

    @vladimir-8
    vladimir-8 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    931f9a2 View commit details
    Browse the repository at this point in the history

  3. removed loadTasks request

    @vladimir-8
    vladimir-8 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    0f3ab4a View commit details
    Browse the repository at this point in the history

  4. Revert "removed loadTasks request" 

    This reverts commit 0f3ab4a.
    @vladimir-8
    vladimir-8 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    6551483 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge branch 'master' into feature/1707-auto-accept 

    # Conflicts:
#	.github/workflows/build_android.yml
    @vladimir-8
    vladimir-8 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    0b9e930 View commit details
    Browse the repository at this point in the history