diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java index a2fd818..2673609 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java @@ -200,6 +200,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { params.put("comment", createOrderNote()); params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed()); params.put("is_champagne_campaign", createOrderActivity.getCartInfo().isChampagneCampaignUsed()); + params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID); if(SessionHelper.getSelectedCoupon() != null){ params.put("coupon", SessionHelper.getSelectedCoupon().getCode()); } @@ -559,6 +560,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { params.put("comment", createOrderNote()); params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed()); params.put("is_champagne_campaign", createOrderActivity.getCartInfo().isChampagneCampaignUsed()); + params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID); if(paymentMethodNonce != null){ params.put("payment_method_nonce", paymentMethodNonce); } diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java index 26de863..520c064 100644 --- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java +++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java @@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; import java.util.ArrayList; @@ -21,6 +22,7 @@ import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiService; import ch.pizzapp.android.api.ResponseArray; import ch.pizzapp.android.helper.DialogHelper; +import ch.pizzapp.android.helper.PriceHelper; import ch.pizzapp.android.helper.SessionHelper; import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.model.ShippingMethodModel; @@ -34,6 +36,7 @@ import retrofit2.Response; public class ShippingMethodFragment extends CreateOrderBaseFragment { + @BindView(R.id.shipmentMethodInfoTextView) TextView shipmentMethodInfoTextView; @BindView(R.id.shippingMethodsRecyclerView) RecyclerView shippingMethodsRecyclerView; @BindString(R.string.alert_choose_shipping_method) String chooseShippingMethodText; @@ -79,6 +82,11 @@ public class ShippingMethodFragment extends CreateOrderBaseFragment { } private void initViews(){ + String shipmentMethodInfoText = + getString(R.string.shipping_method_info) + + " " + + PriceHelper.getPriceWithCurreny(SessionHelper.getSelectedStore().getMinimumPrice()); + shipmentMethodInfoTextView.setText(shipmentMethodInfoText); initRecyclerView(); previousTextView.setVisibility(View.GONE); } diff --git a/app/src/main/res/layout/fragment_shipping_method.xml b/app/src/main/res/layout/fragment_shipping_method.xml index 9d2fc54..687d9ad 100644 --- a/app/src/main/res/layout/fragment_shipping_method.xml +++ b/app/src/main/res/layout/fragment_shipping_method.xml @@ -1,17 +1,39 @@ - + android:orientation="vertical" + android:layout_above="@+id/ordersBottomLayout"> + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4cc6c2d..b9fcb23 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -149,6 +149,7 @@      Bitte wählen Sie eine Lieferungsmethode + Der Mindestbestellwert für die kostenlose Lieferung beträgt