changes
This commit is contained in:
@@ -200,6 +200,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
params.put("comment", createOrderNote());
|
params.put("comment", createOrderNote());
|
||||||
params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed());
|
params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed());
|
||||||
params.put("is_champagne_campaign", createOrderActivity.getCartInfo().isChampagneCampaignUsed());
|
params.put("is_champagne_campaign", createOrderActivity.getCartInfo().isChampagneCampaignUsed());
|
||||||
|
params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID);
|
||||||
if(SessionHelper.getSelectedCoupon() != null){
|
if(SessionHelper.getSelectedCoupon() != null){
|
||||||
params.put("coupon", SessionHelper.getSelectedCoupon().getCode());
|
params.put("coupon", SessionHelper.getSelectedCoupon().getCode());
|
||||||
}
|
}
|
||||||
@@ -559,6 +560,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
|
|||||||
params.put("comment", createOrderNote());
|
params.put("comment", createOrderNote());
|
||||||
params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed());
|
params.put("is_pizza_pass_campaign", createOrderActivity.getCartInfo().isPizzapassCampaignUsed());
|
||||||
params.put("is_champagne_campaign", createOrderActivity.getCartInfo().isChampagneCampaignUsed());
|
params.put("is_champagne_campaign", createOrderActivity.getCartInfo().isChampagneCampaignUsed());
|
||||||
|
params.put("application_id", ApiConstants.APP_TYPE_ID_ANDROID);
|
||||||
if(paymentMethodNonce != null){
|
if(paymentMethodNonce != null){
|
||||||
params.put("payment_method_nonce", paymentMethodNonce);
|
params.put("payment_method_nonce", paymentMethodNonce);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView;
|
|||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
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.ApiService;
|
||||||
import ch.pizzapp.android.api.ResponseArray;
|
import ch.pizzapp.android.api.ResponseArray;
|
||||||
import ch.pizzapp.android.helper.DialogHelper;
|
import ch.pizzapp.android.helper.DialogHelper;
|
||||||
|
import ch.pizzapp.android.helper.PriceHelper;
|
||||||
import ch.pizzapp.android.helper.SessionHelper;
|
import ch.pizzapp.android.helper.SessionHelper;
|
||||||
import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
|
import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
|
||||||
import ch.pizzapp.android.model.ShippingMethodModel;
|
import ch.pizzapp.android.model.ShippingMethodModel;
|
||||||
@@ -34,6 +36,7 @@ import retrofit2.Response;
|
|||||||
|
|
||||||
public class ShippingMethodFragment extends CreateOrderBaseFragment {
|
public class ShippingMethodFragment extends CreateOrderBaseFragment {
|
||||||
|
|
||||||
|
@BindView(R.id.shipmentMethodInfoTextView) TextView shipmentMethodInfoTextView;
|
||||||
@BindView(R.id.shippingMethodsRecyclerView) RecyclerView shippingMethodsRecyclerView;
|
@BindView(R.id.shippingMethodsRecyclerView) RecyclerView shippingMethodsRecyclerView;
|
||||||
|
|
||||||
@BindString(R.string.alert_choose_shipping_method) String chooseShippingMethodText;
|
@BindString(R.string.alert_choose_shipping_method) String chooseShippingMethodText;
|
||||||
@@ -79,6 +82,11 @@ public class ShippingMethodFragment extends CreateOrderBaseFragment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void initViews(){
|
private void initViews(){
|
||||||
|
String shipmentMethodInfoText =
|
||||||
|
getString(R.string.shipping_method_info) +
|
||||||
|
" " +
|
||||||
|
PriceHelper.getPriceWithCurreny(SessionHelper.getSelectedStore().getMinimumPrice());
|
||||||
|
shipmentMethodInfoTextView.setText(shipmentMethodInfoText);
|
||||||
initRecyclerView();
|
initRecyclerView();
|
||||||
previousTextView.setVisibility(View.GONE);
|
previousTextView.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,39 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
tools:ignore="MissingPrefix"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/white">
|
android:background="@color/white">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_above="@+id/ordersBottomLayout">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/shipmentMethodInfoTextView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="12sp"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:layout_marginLeft="16dp"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginRight="16dp"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:textColor="@color/black"/>
|
||||||
|
|
||||||
<android.support.v7.widget.RecyclerView
|
<android.support.v7.widget.RecyclerView
|
||||||
android:id="@+id/shippingMethodsRecyclerView"
|
android:id="@+id/shippingMethodsRecyclerView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:scrollbars="vertical"
|
android:scrollbars="vertical" />
|
||||||
android:layout_above="@+id/ordersBottomLayout"/>
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<include layout="@layout/layout_orders_bottom"/>
|
<include layout="@layout/layout_orders_bottom"/>
|
||||||
|
|
||||||
|
|||||||
@@ -149,6 +149,7 @@
|
|||||||
|
|
||||||
<!-- ShippingMethodFragment-->
|
<!-- ShippingMethodFragment-->
|
||||||
<string name="alert_choose_shipping_method">Bitte wählen Sie eine Lieferungsmethode</string>
|
<string name="alert_choose_shipping_method">Bitte wählen Sie eine Lieferungsmethode</string>
|
||||||
|
<string name="shipping_method_info">Der Mindestbestellwert für die kostenlose Lieferung beträgt</string>
|
||||||
<!-- ShippingMethodFragment-->
|
<!-- ShippingMethodFragment-->
|
||||||
|
|
||||||
<!-- ShippingAddressFragment-->
|
<!-- ShippingAddressFragment-->
|
||||||
|
|||||||
Reference in New Issue
Block a user