volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
cimenmus
2018-10-16 22:30:58 +03:00
parent 5f3c2fc3e0
commit 051ba8e09b
4 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -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);
}

8
app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java
View File

@@ -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);
}

30
app/src/main/res/layout/fragment_shipping_method.xml
View File

@@ -1,17 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<android.support.v7.widget.RecyclerView
android:id="@+id/shippingMethodsRecyclerView"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
android:layout_above="@+id/ordersBottomLayout"/>
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:id="@+id/shippingMethodsRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical" />
</LinearLayout>
<include layout="@layout/layout_orders_bottom"/>

1
app/src/main/res/values/strings.xml
View File

@@ -149,6 +149,7 @@
<!-- ShippingMethodFragment-->    
<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-->
    
<!-- ShippingAddressFragment-->