From 5157398536dc1a4d94dc490fd77d20611ae58e05 Mon Sep 17 00:00:00 2001 From: cimenmus Date: Sun, 22 Oct 2017 00:28:45 +0300 Subject: [PATCH] create order --- .../android/activity/OrderActivity.java | 40 +++-- .../recycler/OrderHistoryRecyclerAdapter.java | 9 - .../pizzalink/android/api/ApiEndPoints.java | 1 + .../pizzalink/android/api/ApiInterface.java | 4 + .../ProductPropertiesBottomSheetDialog.java | 4 +- .../android/fragment/CartFragment.java | 22 ++- .../fragment/order/OrderResultFragment.java | 20 +-- .../fragment/order/OrderSummaryFragment.java | 83 ++++++++- .../fragment/order/PaymentMethodFragment.java | 15 +- .../order/ShippingAddressFragment.java | 16 +- .../order/ShippingMethodFragment.java | 18 +- .../ch/pizzalink/android/model/UserModel.java | 4 + .../android/model/cart/CartInfoModel.java | 3 +- .../android/model/cart/CartProductModel.java | 3 +- .../model/cart/CartProductOptionModel.java | 4 +- .../android/model/cart/CartTotalModel.java | 4 +- .../main/res/layout/fragment_order_result.xml | 21 ++- .../res/layout/fragment_order_summary.xml | 164 +++++++++++++++++- app/src/main/res/layout/row_order_history.xml | 40 +---- app/src/main/res/values/colors.xml | 4 + app/src/main/res/values/strings.xml | 12 ++ 21 files changed, 373 insertions(+), 118 deletions(-) diff --git a/app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java b/app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java index 3f6c007..f9a2d2a 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java @@ -20,6 +20,10 @@ import ch.pizzalink.android.fragment.order.PaymentMethodFragment; import ch.pizzalink.android.fragment.order.ShippingAddressFragment; import ch.pizzalink.android.fragment.order.ShippingMethodFragment; import ch.pizzalink.android.helper.SharedPrefsHelper; +import ch.pizzalink.android.model.AddressModel; +import ch.pizzalink.android.model.PaymentMethodModel; +import ch.pizzalink.android.model.ShippingMethodModel; +import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzalink.android.view.NoSwipeViewPager; import ch.pizzalink.android.view.PizzalinkToolbar; @@ -30,14 +34,24 @@ public class OrderActivity extends BaseActivity { private FragmentManager fragmentManager; + private CartInfoModel cartInfoModel; + private ShippingMethodModel selectedShippingMethod; + private AddressModel selectedShippingAddress; + private PaymentMethodModel selectedPaymentMethod; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_order); ButterKnife.bind(this); + getDataFromIntent(); initViews(); } + private void getDataFromIntent(){ + cartInfoModel = (CartInfoModel) getIntent().getSerializableExtra("cartInfoModel"); + } + private void initViews(){ orderToolbar.setBackIconClickListener(new View.OnClickListener() { @Override @@ -129,27 +143,31 @@ public class OrderActivity extends BaseActivity { } } - public void setShippingInfo(){ - + public CartInfoModel getCartInfo(){ + return cartInfoModel; } - public void getShippingMethodTitle(){ - + public ShippingMethodModel getSelectedShippingMethod(){ + return selectedShippingMethod; } - public void getShippingMethodCode(){ - + public void setSelectedShippingMethod(ShippingMethodModel selectedShippingMethod){ + this.selectedShippingMethod = selectedShippingMethod; } - public void setPaymentInfo(){ - + public AddressModel getSelectedShippingAddress(){ + return selectedShippingAddress; } - public void getPaymentMethodTitle(){ - + public void setSelectedShippingAddress(AddressModel selectedShippingAddress){ + this.selectedShippingAddress = selectedShippingAddress; } - public void getPaymentMethodCode(){ + public PaymentMethodModel getSelectedPaymentMethod(){ + return selectedPaymentMethod; + } + public void setSelectedPaymentMethod(PaymentMethodModel selectedPaymentMethod){ + this.selectedPaymentMethod = selectedPaymentMethod; } } diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java b/app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java index 439e037..6a7981b 100644 --- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java +++ b/app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java @@ -32,19 +32,10 @@ public class OrderHistoryRecyclerAdapter extends RecyclerView.Adapter> createOrder(@Url String url, @FieldMap HashMap body); + } diff --git a/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java b/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java index 485cb3d..f124647 100644 --- a/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java +++ b/app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java @@ -266,7 +266,9 @@ public class ProductPropertiesBottomSheetDialog extends BottomSheetDialogFragmen private void addProductToCart(){ DialogHelper.showLoadingDialog(); Call> call = - ApiService.apiInterface.addProductsToBasket(ApiEndPoints.API_ADD_PRODUCTS_TO_BASKET + SessionHelper.getCustomerToken().getToken(), getAddToCartRequestParams()); + ApiService.apiInterface.addProductsToBasket( + ApiEndPoints.API_ADD_PRODUCTS_TO_BASKET + SessionHelper.getCustomerToken().getToken(), + getAddToCartRequestParams()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java index 234086c..20c2834 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java @@ -66,6 +66,7 @@ public class CartFragment extends BaseFragment { public static final java.lang.String FRAGMENT_NAME = "cartFragment"; + private CartInfoModel cartInfoModel; private ArrayList cartProductList = new ArrayList<>(); private CartRecyclerAdapter cartRecyclerAdapter; @@ -107,7 +108,9 @@ public class CartFragment extends BaseFragment { }); break; case R.id.continueCartButton: - startActivity(new Intent(BaseActivity.currentActivity, OrderActivity.class)); + Intent continueCartIntent = new Intent(BaseActivity.currentActivity, OrderActivity.class); + continueCartIntent.putExtra("cartInfoModel", cartInfoModel); + startActivity(continueCartIntent); break; } } @@ -128,8 +131,9 @@ public class CartFragment extends BaseFragment { if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()){ - setCartTotalFields(response.body().getData().getTotals().get(0)); - fillAndNotifyAdapter(response.body().getData().getProducts()); + cartInfoModel = response.body().getData(); + setCartTotalFields(); + fillAndNotifyAdapter(); } else ApiErrorUtils.parseError(response); @@ -172,17 +176,17 @@ public class CartFragment extends BaseFragment { }); } - private void fillAndNotifyAdapter(ArrayList cartList){ - CartProductModel.checkNull(cartList); + private void fillAndNotifyAdapter(){ + CartProductModel.checkNull(cartInfoModel.getProducts()); cartProductList.clear(); - cartProductList.addAll(cartList); + cartProductList.addAll(cartInfoModel.getProducts()); cartRecyclerAdapter.notifyDataSetChanged(); setCartLayoutsVisibility(); } - private void setCartTotalFields(CartTotalModel cartTotalModel){ - cartTotalLabelTextView.setText(cartTotalModel.getTitle()); - cartProductTotalTextView.setText(cartTotalModel.getText()); + private void setCartTotalFields(){ + cartTotalLabelTextView.setText(cartInfoModel.getTotals().get(0).getTitle()); + cartProductTotalTextView.setText(cartInfoModel.getTotals().get(0).getText()); } private void initRecyclerView(){ diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/OrderResultFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/OrderResultFragment.java index 73988e5..0286835 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/OrderResultFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/OrderResultFragment.java @@ -11,6 +11,7 @@ import butterknife.OnClick; import ch.pizzalink.android.R; import ch.pizzalink.android.activity.OrderActivity; import ch.pizzalink.android.fragment.BaseFragment; +import ch.pizzalink.android.helper.SharedPrefsHelper; /** * Created by cimenmus on 17/10/2017. @@ -22,8 +23,6 @@ public class OrderResultFragment extends OrderBaseFragment { public static final java.lang.String FRAGMENT_NAME = "orderResultFragment"; - private boolean isOrderSuccessed; - public OrderResultFragment() {} public static OrderResultFragment newInstance() { @@ -43,23 +42,14 @@ public class OrderResultFragment extends OrderBaseFragment { return view; } - @OnClick({R.id.previousTextView, R.id.nextTextView}) - protected void onClick(View view){ + @OnClick( R.id.nextTextView) + protected void onClick(){ OrderActivity orderActivity = (OrderActivity) getActivity(); - switch (view.getId()){ - case R.id.previousTextView: - orderActivity.onPreviousClicked(FRAGMENT_NAME); - break; - case R.id.nextTextView: - if(isOrderSuccessed){ - orderActivity.onNextClicked(FRAGMENT_NAME); - } - break; - } + orderActivity.onNextClicked(FRAGMENT_NAME); } private void initViews(){ - isOrderSuccessed = true; + SharedPrefsHelper.setCartItemCount(0); previousTextView.setVisibility(View.GONE); nextTextView.setText(doneOrderText); } diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/OrderSummaryFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/OrderSummaryFragment.java index ae6f251..ee8255e 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/OrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/OrderSummaryFragment.java @@ -4,13 +4,26 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; + +import java.util.HashMap; import butterknife.BindString; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import ch.pizzalink.android.R; import ch.pizzalink.android.activity.OrderActivity; -import ch.pizzalink.android.fragment.BaseFragment; +import ch.pizzalink.android.api.ApiEndPoints; +import ch.pizzalink.android.api.ApiErrorUtils; +import ch.pizzalink.android.api.ApiService; +import ch.pizzalink.android.api.ResponseObject; +import ch.pizzalink.android.helper.DialogHelper; +import ch.pizzalink.android.helper.SessionHelper; +import ch.pizzalink.android.helper.SharedPrefsHelper; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; /** * Created by cimenmus on 17/10/2017. @@ -18,9 +31,16 @@ import ch.pizzalink.android.fragment.BaseFragment; public class OrderSummaryFragment extends OrderBaseFragment { + @BindView(R.id.orderPersonFullnameTextView) TextView orderPersonFullnameTextView; + @BindView(R.id.orderShippingMethodTextView) TextView orderShippingMethodTextView; + @BindView(R.id.orderShippingAddressTextView) TextView orderShippingAddressTextView; + @BindView(R.id.orderPaymentMethodTextView) TextView orderPaymentMethodTextView; + @BindView(R.id.orderTotalTextView) TextView orderTotalTextView; + @BindString(R.string.confirm_order) String confirmOrderText; public static final java.lang.String FRAGMENT_NAME = "orderSummaryFragment"; + private OrderActivity orderActivity; public OrderSummaryFragment() {} @@ -41,13 +61,68 @@ public class OrderSummaryFragment extends OrderBaseFragment { return view; } - @OnClick(R.id.nextTextView) - protected void onClick(){ + @OnClick({R.id.previousTextView, R.id.nextTextView}) + protected void onClick(View view){ OrderActivity orderActivity = (OrderActivity) getActivity(); - orderActivity.onNextClicked(FRAGMENT_NAME); + switch (view.getId()){ + case R.id.previousTextView: + orderActivity.onPreviousClicked(FRAGMENT_NAME); + break; + case R.id.nextTextView: + //orderActivity.onNextClicked(FRAGMENT_NAME); + createOrder(); + break; + } } private void initViews(){ + nextTextView.setText(confirmOrderText); + + orderActivity = (OrderActivity) getActivity(); + + orderPersonFullnameTextView.setText(SessionHelper.getUser().getFullname()); + orderShippingMethodTextView.setText(orderActivity.getSelectedShippingMethod().getTitle()); + orderShippingAddressTextView.setText(orderActivity.getSelectedShippingAddress().getAddress()); + orderPaymentMethodTextView.setText(orderActivity.getSelectedPaymentMethod().getTitle()); + orderTotalTextView.setText(orderActivity.getCartInfo().getTotals().get(0).getText()); + } + + private void createOrder(){ + DialogHelper.showLoadingDialog(); + Call> call = ApiService.apiInterface.createOrder( + ApiEndPoints.API_CREATE_ORDER + SessionHelper.getCustomerToken().getToken(), getCreateOrderParams()); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + DialogHelper.hideLoadingDialog(); + if(response.isSuccessful() && response.body().isSuccess()){ + orderActivity.onNextClicked(FRAGMENT_NAME); + } + else{ + //orderActivity.onNextClicked(FRAGMENT_NAME); + ApiErrorUtils.parseError(response); + } + + } + + @Override + public void onFailure(Call> call, Throwable t) { + DialogHelper.hideLoadingDialog(); + DialogHelper.showFailedDialog(); + //orderActivity.onNextClicked(FRAGMENT_NAME); + } + }); + } + + private HashMap getCreateOrderParams(){ + HashMap params = new HashMap<>(); + params.put("customer_id", SessionHelper.getUser().getId()); + params.put("shipping_method_title", orderActivity.getSelectedShippingMethod().getTitle()); + params.put("shipping_method_code", orderActivity.getSelectedShippingMethod().getCode()); + params.put("address_id", orderActivity.getSelectedShippingAddress().getId()); + params.put("payment_method_title", orderActivity.getSelectedPaymentMethod().getTitle()); + params.put("payment_method_code", orderActivity.getSelectedPaymentMethod().getCode()); + return params; } } diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/PaymentMethodFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/PaymentMethodFragment.java index 17378d4..0f0dccf 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/PaymentMethodFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/PaymentMethodFragment.java @@ -44,7 +44,7 @@ public class PaymentMethodFragment extends OrderBaseFragment { private ArrayList paymentMethodList = new ArrayList<>(); private PaymentMethodsRecyclerAdapter paymentMethodsRecyclerAdapter; - private boolean isPaymentMethodSelected; + private PaymentMethodModel selectedPaymentMethod; public static final java.lang.String FRAGMENT_NAME = "paymentMethodFragment"; @@ -76,12 +76,13 @@ public class PaymentMethodFragment extends OrderBaseFragment { orderActivity.onPreviousClicked(FRAGMENT_NAME); break; case R.id.nextTextView: - if(isPaymentMethodSelected){ - orderActivity.onNextClicked(FRAGMENT_NAME); - } - else { + + if(selectedPaymentMethod == null){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, choosePaymentMethodText); + break; } + orderActivity.setSelectedPaymentMethod(selectedPaymentMethod); + orderActivity.onNextClicked(FRAGMENT_NAME); break; } } @@ -123,7 +124,7 @@ public class PaymentMethodFragment extends OrderBaseFragment { paymentMethodList.addAll(paymentMethodModels); if(paymentMethodList.size() != 0){ paymentMethodList.get(0).setSelected(true); - isPaymentMethodSelected = true; + selectedPaymentMethod = paymentMethodList.get(0); } paymentMethodsRecyclerAdapter.notifyDataSetChanged(); } @@ -136,7 +137,7 @@ public class PaymentMethodFragment extends OrderBaseFragment { paymentMethodModel.setSelected(false); } paymentMethodList.get(position).setSelected(true); - isPaymentMethodSelected = true; + selectedPaymentMethod = paymentMethodList.get(position); paymentMethodsRecyclerAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/ShippingAddressFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/ShippingAddressFragment.java index 22cd22d..f0fa111 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/ShippingAddressFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/ShippingAddressFragment.java @@ -42,7 +42,7 @@ public class ShippingAddressFragment extends OrderBaseFragment { private ArrayList addressList = new ArrayList<>(); private ShippingAddressesRecyclerAdapter shippingAddressesRecyclerAdapter; - private boolean isShippingAddressSelected; + private AddressModel selectedAddress; public static final java.lang.String FRAGMENT_NAME = "shippingAddressMethod"; @@ -74,12 +74,14 @@ public class ShippingAddressFragment extends OrderBaseFragment { orderActivity.onPreviousClicked(FRAGMENT_NAME); break; case R.id.nextTextView: - if(isShippingAddressSelected){ - orderActivity.onNextClicked(FRAGMENT_NAME); - } - else { + + if(selectedAddress == null){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, chooseShippingAddressText); + return; } + + orderActivity.setSelectedShippingAddress(selectedAddress); + orderActivity.onNextClicked(FRAGMENT_NAME); break; } } @@ -120,7 +122,7 @@ public class ShippingAddressFragment extends OrderBaseFragment { addressList.addAll(addressModels); if(addressList.size() != 0){ addressList.get(0).setSelected(true); - isShippingAddressSelected = true; + selectedAddress = addressList.get(0); } shippingAddressesRecyclerAdapter.notifyDataSetChanged(); } @@ -133,7 +135,7 @@ public class ShippingAddressFragment extends OrderBaseFragment { addressModel.setSelected(false); } addressList.get(position).setSelected(true); - isShippingAddressSelected = true; + selectedAddress = addressList.get(position); shippingAddressesRecyclerAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/ShippingMethodFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/ShippingMethodFragment.java index febedd2..5fd7ac0 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/order/ShippingMethodFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/order/ShippingMethodFragment.java @@ -45,7 +45,7 @@ public class ShippingMethodFragment extends OrderBaseFragment { private ArrayList shippingMethodList = new ArrayList<>(); private ShippingMethodsRecyclerAdapter shippingMethodsRecyclerAdapter; - private boolean isShippingMethodSelected; + private ShippingMethodModel selectedShippingMethodModel; public static final java.lang.String FRAGMENT_NAME = "shippingMethodFragment"; @@ -71,13 +71,15 @@ public class ShippingMethodFragment extends OrderBaseFragment { @OnClick(R.id.nextTextView) protected void onClick(){ - if(isShippingMethodSelected){ - OrderActivity orderActivity = (OrderActivity) getActivity(); - orderActivity.onNextClicked(FRAGMENT_NAME); - } - else { + + if(selectedShippingMethodModel == null){ DialogHelper.showAlertDialog(BaseActivity.currentActivity, chooseShippingMethodText); + return; } + + OrderActivity orderActivity = (OrderActivity) getActivity(); + orderActivity.setSelectedShippingMethod(selectedShippingMethodModel); + orderActivity.onNextClicked(FRAGMENT_NAME); } private void initViews(){ @@ -117,7 +119,7 @@ public class ShippingMethodFragment extends OrderBaseFragment { shippingMethodList.addAll(shippingMethodModels); if(shippingMethodList.size() != 0){ shippingMethodList.get(0).setSelected(true); - isShippingMethodSelected = true; + selectedShippingMethodModel = shippingMethodList.get(0); } shippingMethodsRecyclerAdapter.notifyDataSetChanged(); } @@ -130,7 +132,7 @@ public class ShippingMethodFragment extends OrderBaseFragment { shippingMethodModel.setSelected(false); } shippingMethodList.get(position).setSelected(true); - isShippingMethodSelected = true; + selectedShippingMethodModel = shippingMethodList.get(position); shippingMethodsRecyclerAdapter.notifyDataSetChanged(); } }); diff --git a/app/src/main/java/ch/pizzalink/android/model/UserModel.java b/app/src/main/java/ch/pizzalink/android/model/UserModel.java index 4120d82..574c536 100644 --- a/app/src/main/java/ch/pizzalink/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/UserModel.java @@ -37,6 +37,10 @@ public class UserModel { token.checkNull(); } + public String getFullname(){ + return firstname + " " + lastname; + } + public String getId() { return id; } diff --git a/app/src/main/java/ch/pizzalink/android/model/cart/CartInfoModel.java b/app/src/main/java/ch/pizzalink/android/model/cart/CartInfoModel.java index 0e57f06..f91ff9c 100644 --- a/app/src/main/java/ch/pizzalink/android/model/cart/CartInfoModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/cart/CartInfoModel.java @@ -1,12 +1,13 @@ package ch.pizzalink.android.model.cart; +import java.io.Serializable; import java.util.ArrayList; /** * Created by cimenmus on 05/10/2017. */ -public class CartInfoModel { +public class CartInfoModel implements Serializable { private ArrayList products; private ArrayList totals; diff --git a/app/src/main/java/ch/pizzalink/android/model/cart/CartProductModel.java b/app/src/main/java/ch/pizzalink/android/model/cart/CartProductModel.java index 03587e6..8426736 100644 --- a/app/src/main/java/ch/pizzalink/android/model/cart/CartProductModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/cart/CartProductModel.java @@ -3,13 +3,14 @@ package ch.pizzalink.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import java.io.Serializable; import java.util.ArrayList; /** * Created by cimenmus on 05/10/2017. */ -public class CartProductModel { +public class CartProductModel implements Serializable { @Expose @SerializedName("cart_id") private String cartId; @Expose @SerializedName("product_id") private String productId; diff --git a/app/src/main/java/ch/pizzalink/android/model/cart/CartProductOptionModel.java b/app/src/main/java/ch/pizzalink/android/model/cart/CartProductOptionModel.java index 847193b..f22de1f 100644 --- a/app/src/main/java/ch/pizzalink/android/model/cart/CartProductOptionModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/cart/CartProductOptionModel.java @@ -3,11 +3,13 @@ package ch.pizzalink.android.model.cart; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import java.io.Serializable; + /** * Created by cimenmus on 05/10/2017. */ -public class CartProductOptionModel { +public class CartProductOptionModel implements Serializable { @Expose @SerializedName("product_option_id") private String id; @Expose @SerializedName("product_option_value_id") private String valueId; diff --git a/app/src/main/java/ch/pizzalink/android/model/cart/CartTotalModel.java b/app/src/main/java/ch/pizzalink/android/model/cart/CartTotalModel.java index 890caec..080c6ce 100644 --- a/app/src/main/java/ch/pizzalink/android/model/cart/CartTotalModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/cart/CartTotalModel.java @@ -1,10 +1,12 @@ package ch.pizzalink.android.model.cart; +import java.io.Serializable; + /** * Created by cimenmus on 05/10/2017. */ -public class CartTotalModel { +public class CartTotalModel implements Serializable { private String title; private String text; diff --git a/app/src/main/res/layout/fragment_order_result.xml b/app/src/main/res/layout/fragment_order_result.xml index 50c6233..ba44800 100644 --- a/app/src/main/res/layout/fragment_order_result.xml +++ b/app/src/main/res/layout/fragment_order_result.xml @@ -6,12 +6,21 @@ android:layout_height="match_parent" android:background="@color/white"> - + + + + + diff --git a/app/src/main/res/layout/fragment_order_summary.xml b/app/src/main/res/layout/fragment_order_summary.xml index 8595f97..c1a28d7 100644 --- a/app/src/main/res/layout/fragment_order_summary.xml +++ b/app/src/main/res/layout/fragment_order_summary.xml @@ -6,12 +6,164 @@ android:layout_height="match_parent" android:background="@color/white"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/row_order_history.xml b/app/src/main/res/layout/row_order_history.xml index 78809db..69ae95b 100644 --- a/app/src/main/res/layout/row_order_history.xml +++ b/app/src/main/res/layout/row_order_history.xml @@ -18,37 +18,15 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - + #F4F4F4 + + #ABB6C2 + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1af4437..b95cb90 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -140,6 +140,18 @@ APPROVE DONE + + TO + SHIPPING METHOD + SHIPPING ADDRESS + PAYMENT METHOD + TOTAL + + + + Siparişiniz başarı ile alınmıştır. Siparişinizin detaylarını sipariş geçmişinden görebilir ve siparişinizi takip edebilirsiniz. + + Shipping Method Shipping Address