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

Feature/159/autofill vendor tables issue #160

Merged
merged 94 commits into from
Jun 18, 2019

Conversation

pankajatocdlab
Copy link
Contributor

No description provided.

…ts from immutable data to javascript objects.
…b.com/prezzoapp/prezzo into feature/121/edit-user-profile-picture

# Conflicts:
#	App.js
#	src/containers/customer/Profile/Profile.js

- Rebase against `feature/105/component-remount-issue`
…com/prezzoapp/prezzo into feature/126/unable-to-create-vendor

# Conflicts:
#	src/containers/vendor/AccountInfo/AccountInfo.js
#	src/containers/vendor/AccountInfo/styles.js

- Rebase against `feature/121/edit-user-profile-picture` branch.
…om/prezzoapp/prezzo into feature/127/menu-item-clears-state

# Conflicts:
#	src/containers/vendor/CreateMenu/CreateMenu.js

- Rebase against `feature/126/unable-to-create-vendor`
…ts from immutable data to javascript objects.
Contains code from all the open PR(s) expect PR #71 (facebook login).
…b.com/prezzoapp/prezzo into feature/118/call-waiter-expo-upgraded

# Conflicts:
#	.expo/packager-info.json
#	App.js
#	app.json
#	package-lock.json
#	package.json
#	src/components/CheckoutSwiper/CheckoutSwiper.js
#	src/components/ClosedTableTabs/ClosedTableTabs.js
#	src/components/ExploreSearchInput/ExploreSearchInput.js
#	src/components/FilteredVendorBottomCard/FilteredVendorBottomCard.js
#	src/components/MenuButton/MenuButton.js
#	src/components/MenuItem/MenuItem.js
#	src/components/OpenDeliveryDetails/OpenDeliveryDetails.js
#	src/components/OpenTableItem/OpenTableItem.js
#	src/components/OpenTablePayment/OpenTablePayment.js
#	src/components/OrderedItem/OrderedItem.js
#	src/components/QueuedTableItem/QueuedTableItem.js
#	src/components/RestaurantItem/RestaurantItem.js
#	src/components/TableGridItem/TableGridItem.js
#	src/components/TableListHeader/TableListHeader.js
#	src/containers/authentication/Login/Login.js
#	src/containers/authentication/Signup/SignupEmail.js
#	src/containers/authentication/Signup/SignupMergeFacebook.js
#	src/containers/authentication/Signup/SignupName.js
#	src/containers/authentication/Signup/SignupPassword.js
#	src/containers/customer/EditProfile/EditProfile.js
#	src/containers/customer/Explore/Explore.js
#	src/containers/customer/Explore/styles.js
#	src/containers/customer/ExploreList/ExploreList.js
#	src/containers/customer/MapScreen/MapScreen.js
#	src/containers/customer/PaymentDetails/PaymentDetails.js
#	src/containers/customer/RestaurantDetails/RestaurantDetails.js
#	src/containers/vendor/CreateMenu/CreateMenu.js
#	src/containers/vendor/OpenTableDetails/OpenTableDetails.js
#	src/containers/vendor/VendorAdminActivityDetails/VendorAdminActivityDetails.js
#	yarn.lock

- Rebased against updated dev
- Resolve local image assets are not showing issue.
…is disconnected from internet & vendor tries to load more tables(Open, Queue & Closed) data by scrolling the list(s).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants