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

texts changed

Browse Source
This commit is contained in:
cimenmus
2018-08-25 21:44:45 +03:00
parent ab0085720c
commit ca20d2fd3d
3 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@ import com.braintreepayments.api.dropin.DropInActivity;
import com.braintreepayments.api.dropin.DropInRequest;
import com.braintreepayments.api.dropin.DropInResult;
import com.google.android.gms.wallet.Cart;
import com.google.android.gms.wallet.LineItem;
import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
import com.wdullaer.materialdatetimepicker.time.Timepoint;
@@ -25,7 +24,6 @@ import com.wdullaer.materialdatetimepicker.time.Timepoint;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import butterknife.BindString;
import butterknife.BindView;
@@ -33,7 +31,6 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import ch.pizzapp.android.R;
import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzapp.android.activity.CampaignProductListActivity;
import ch.pizzapp.android.activity.CreateOrderActivity;
import ch.pizzapp.android.adapter.recycler.OrderPriceRecyclerAdapter;
import ch.pizzapp.android.api.ApiConstants;
@@ -45,7 +42,6 @@ import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.model.CampaignModel;
import ch.pizzapp.android.model.PaymentMethodModel;
import ch.pizzapp.android.model.StoreShiftModel;
import ch.pizzapp.android.model.StoreWorkDayModel;
@@ -57,8 +53,6 @@ import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
import static android.app.Activity.RESULT_OK;
/**
* Created by cimenmus on 17/10/2017.
*/
@@ -74,9 +68,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
@BindView(R.id.orderNotePizzalinkInfoLayout) AppInfoView orderNotePizzalinkInfoLayout;
@BindString(R.string.confirm_order) String confirmOrderText;
@BindString(R.string.slice_pizza) String slicePizzaText;
@BindString(R.string.yes) String yesText;
@BindString(R.string.no) String noText;
@BindString(R.string.slice_pizza_for_store) String slicePizzaForStoreText;
@BindString(R.string.slice_pizza) String yesText;
@BindString(R.string.do_not_slice_pizza) String noText;
@BindString(R.string.restaurant_out_of_order) String restaurantOutOfOrderText;
@BindString(R.string.restaurant_out_of_order_on_selected_date) String restaurantOutOfOrderOnSelectedDateText;
@BindString(R.string.something_went_wrong) String genericErrorText;
@@ -525,19 +519,19 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
StringBuilder stringBuilder = new StringBuilder();
if(isCartContainsAnyPizza()){
stringBuilder.append(slicePizzaText).append(" : ");
stringBuilder.append(slicePizzaForStoreText).append(" : ");
if(createOrderActivity.getSlicePizza()){
stringBuilder.append(yesText);
}
else {
stringBuilder.append(noText);
}
stringBuilder.append("<br/>");
stringBuilder.append("\n");
}
stringBuilder
.append(createOrderActivity.getOrderNote())
.append("<br/>");
.append("\n");
if(dateOfOrderString != null && !dateOfOrderString.isEmpty() &&
timeOfOrder != null && !timeOfOrder.isEmpty()){
@@ -553,7 +547,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
}
if(stringBuilder.toString().equals("\n<br/>") || stringBuilder.toString().equals("<br/>")){
if(stringBuilder.toString().equals("\n") || stringBuilder.toString().equals("\n<br/>") || stringBuilder.toString().equals("<br/>")){
return "";
}
else {