beta bugs fixed

2017-10-28 15:22:27 +03:00
parent 454e06607a
commit 5d5b9c5af7
21 changed files with 229 additions and 476 deletions
--- a/app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java
@@ -3,31 +3,24 @@ package ch.pizzalink.android.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.widget.TextView;

 import com.badoualy.stepperindicator.StepperIndicator;

 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import ch.pizzalink.android.R;
-import ch.pizzalink.android.adapter.pager.OrderPagerAdapter;
-import ch.pizzalink.android.fragment.order.OrderResultFragment;
-import ch.pizzalink.android.fragment.order.OrderSummaryFragment;
-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.fragment.createOrder.CreateOrderResultFragment;
+import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment;
+import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment;
+import ch.pizzalink.android.fragment.createOrder.ShippingAddressFragment;
+import ch.pizzalink.android.fragment.createOrder.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;

-public class OrderActivity extends BaseActivity {
+public class CreateOrderActivity extends BaseActivity {

    @BindView(R.id.stepperIndicator) StepperIndicator stepperIndicator;

@@ -41,7 +34,7 @@ public class OrderActivity extends BaseActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_order);
+        setContentView(R.layout.activity_create_order);
        ButterKnife.bind(this);
        getDataFromIntent();
        initViews();
@@ -93,11 +86,11 @@ public class OrderActivity extends BaseActivity {
                break;
            case 3:
                fragmentManager.beginTransaction().replace(R.id.orderFragmentsContainer,
-                        OrderSummaryFragment.newInstance()).commit();
+                        CreateOrderSummaryFragment.newInstance()).commit();
                break;
            case 4:
                fragmentManager.beginTransaction().replace(R.id.orderFragmentsContainer,
-                        OrderResultFragment.newInstance()).commit();
+                        CreateOrderResultFragment.newInstance()).commit();
                break;
        }
        stepperIndicator.setCurrentStep(position);
@@ -114,10 +107,10 @@ public class OrderActivity extends BaseActivity {
            case PaymentMethodFragment.FRAGMENT_NAME:
                openFragment(3);
                break;
-            case OrderSummaryFragment.FRAGMENT_NAME:
+            case CreateOrderSummaryFragment.FRAGMENT_NAME:
                openFragment(4);
                break;
-            case OrderResultFragment.FRAGMENT_NAME:
+            case CreateOrderResultFragment.FRAGMENT_NAME:
                Intent mainActivityIntent = new Intent(this, MainActivity.class);
                mainActivityIntent.putExtra("isStartWithOrderHistory", true);
                startActivity(mainActivityIntent);
@@ -135,7 +128,7 @@ public class OrderActivity extends BaseActivity {
            case PaymentMethodFragment.FRAGMENT_NAME:
                openFragment(1);
                break;
-            case OrderSummaryFragment.FRAGMENT_NAME:
+            case CreateOrderSummaryFragment.FRAGMENT_NAME:
                openFragment(2);
                break;
        }
--- a/app/src/main/java/ch/pizzalink/android/adapter/pager/OrderPagerAdapter.java
+++ b/app/src/main/java/ch/pizzalink/android/adapter/pager/OrderPagerAdapter.java
@@ -4,11 +4,11 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;

-import ch.pizzalink.android.fragment.order.OrderResultFragment;
-import ch.pizzalink.android.fragment.order.OrderSummaryFragment;
-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.fragment.createOrder.CreateOrderResultFragment;
+import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment;
+import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment;
+import ch.pizzalink.android.fragment.createOrder.ShippingAddressFragment;
+import ch.pizzalink.android.fragment.createOrder.ShippingMethodFragment;

 /**
 * Created by cimenmus on 17/10/2017.
@@ -30,9 +30,9 @@ public class OrderPagerAdapter extends FragmentPagerAdapter {
            case 2:
                return PaymentMethodFragment.newInstance();
            case 3:
-                return OrderSummaryFragment.newInstance();
+                return CreateOrderSummaryFragment.newInstance();
            case 4:
-                return OrderResultFragment.newInstance();
+                return CreateOrderResultFragment.newInstance();
            default:
                return ShippingMethodFragment.newInstance();
        }
--- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
+++ b/app/src/main/java/ch/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java
@@ -15,6 +15,7 @@ import butterknife.ButterKnife;
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.helper.ImageLoadHelper;
 import ch.pizzalink.android.helper.PriceHelper;
+import ch.pizzalink.android.helper.TextHelper;
 import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
 import ch.pizzalink.android.model.menu.MenuProductModel;

@@ -109,12 +110,18 @@ public class MenuProductRecyclerAdapter extends RecyclerView.Adapter<RecyclerVie
                menuProductViewHolder.productNameTextView.setText(menuProductList.get(position).getName());
                menuProductViewHolder.productPriceTextView.setText(
                        PriceHelper.getPriceWithCurreny(menuProductList.get(position).getPrice()));
+
+                TextHelper.setTextFromHTML(menuProductViewHolder.productIngredientsTextView, menuProductList.get(position).getDescription());
+
+                /*
                if(menuProductList.get(position).isDescriptionAvailable()){
                    menuProductViewHolder.productIngredientsLayout.setVisibility(View.VISIBLE);
                    menuProductViewHolder.productIngredientsTextView.setText(menuProductList.get(position).getDescription());
                }
                else
                    menuProductViewHolder.productIngredientsLayout.setVisibility(View.GONE);
+                    */
+
                break;

            case HOLDER_SPACE :
--- a/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java
@@ -26,8 +26,8 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.activity.BaseActivity;
+import ch.pizzalink.android.activity.CreateOrderActivity;
 import ch.pizzalink.android.activity.MainActivity;
-import ch.pizzalink.android.activity.OrderActivity;
 import ch.pizzalink.android.adapter.recycler.CartRecyclerAdapter;
 import ch.pizzalink.android.api.ApiEndPoints;
 import ch.pizzalink.android.api.ApiErrorUtils;
@@ -40,7 +40,6 @@ import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
 import ch.pizzalink.android.model.RemoveProductFromCartResponseModel;
 import ch.pizzalink.android.model.cart.CartInfoModel;
 import ch.pizzalink.android.model.cart.CartProductModel;
-import ch.pizzalink.android.model.cart.CartTotalModel;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -113,7 +112,7 @@ public class CartFragment extends BaseFragment {
                        });
                break;
            case R.id.continueCartButton:
-                Intent continueCartIntent = new Intent(BaseActivity.currentActivity, OrderActivity.class);
+                Intent continueCartIntent = new Intent(BaseActivity.currentActivity, CreateOrderActivity.class);
                continueCartIntent.putExtra("cartInfoModel", cartInfoModel);
                startActivity(continueCartIntent);
                break;
--- a/app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java
@@ -8,6 +8,8 @@ import android.view.View;
 import android.view.ViewGroup;

 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;

 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -115,6 +117,7 @@ public class MenuFragment extends BaseFragment {
        MenuProductModel.checkNull(productList);
        menuProductList.clear();
        menuProductList.addAll(productList);
+        sortProductsByName();
        menuProductRecyclerAdapter.notifyDataSetChanged();
    }

@@ -124,6 +127,13 @@ public class MenuFragment extends BaseFragment {
        productPropertiesBottomSheetDialog.show(getChildFragmentManager(), "dialog");
    }

-
+    private void sortProductsByName(){
+        Collections.sort(menuProductList, new Comparator<MenuProductModel>() {
+            @Override
+            public int compare(MenuProductModel product1, MenuProductModel product2) {
+                return  product1.getName().compareTo(product2.getName());
+            }
+        });
+    }

 }
--- a/app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java
@@ -37,7 +37,7 @@ public class ProductFragment extends BaseFragment {

    @BindView(R.id.customProductRecyclerView) RecyclerView customProductRecyclerView;

-    public static final java.lang.String FRAGMENT_NAME = "productFragment";
+    public static final String FRAGMENT_NAME = "productFragment";
    private ArrayList<MenuProductModel> productList = new ArrayList<>();
    private MenuProductRecyclerAdapter menuProductRecyclerAdapter;
    private CategoryModel categoryModel;
@@ -134,4 +134,8 @@ public class ProductFragment extends BaseFragment {
        productPropertiesBottomSheetDialog.setMenuProductModel(menuProductModel);
        productPropertiesBottomSheetDialog.show(getChildFragmentManager(), "dialog");
    }
+
+    private void sortProductsByName(){
+
+    }
 }
--- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderBaseFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderBaseFragment.java
@@ -1,4 +1,4 @@
-package ch.pizzalink.android.fragment.order;
+package ch.pizzalink.android.fragment.createOrder;

 import android.widget.TextView;

@@ -10,7 +10,7 @@ import ch.pizzalink.android.fragment.BaseFragment;
 * Created by cimenmus on 21.10.2017.
 */

-public class OrderBaseFragment extends BaseFragment {
+public class CreateOrderBaseFragment extends BaseFragment {

    @BindView(R.id.previousTextView) TextView previousTextView;
    @BindView(R.id.nextTextView) TextView nextTextView;
--- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderResultFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderResultFragment.java
@@ -1,4 +1,4 @@
-package ch.pizzalink.android.fragment.order;
+package ch.pizzalink.android.fragment.createOrder;

 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -9,24 +9,23 @@ import butterknife.BindString;
 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.activity.CreateOrderActivity;
 import ch.pizzalink.android.helper.SharedPrefsHelper;

 /**
 * Created by cimenmus on 17/10/2017.
 */

-public class OrderResultFragment extends OrderBaseFragment {
+public class CreateOrderResultFragment extends CreateOrderBaseFragment {

    @BindString(R.string.done_order) String doneOrderText;

    public static final java.lang.String FRAGMENT_NAME = "orderResultFragment";

-    public OrderResultFragment() {}
+    public CreateOrderResultFragment() {}

-    public static OrderResultFragment newInstance() {
-        return new OrderResultFragment();
+    public static CreateOrderResultFragment newInstance() {
+        return new CreateOrderResultFragment();
    }

    @Override
@@ -36,7 +35,7 @@ public class OrderResultFragment extends OrderBaseFragment {

    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_order_result, container, false);
+        View view = inflater.inflate(R.layout.fragment_create_order_result, container, false);
        ButterKnife.bind(this, view);
        initViews();
        return view;
@@ -44,8 +43,8 @@ public class OrderResultFragment extends OrderBaseFragment {

    @OnClick( R.id.nextTextView)
    protected void onClick(){
-        OrderActivity orderActivity = (OrderActivity) getActivity();
-        orderActivity.onNextClicked(FRAGMENT_NAME);
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        createOrderActivity.onNextClicked(FRAGMENT_NAME);
    }

    private void initViews(){
--- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -1,10 +1,9 @@
-package ch.pizzalink.android.fragment.order;
+package ch.pizzalink.android.fragment.createOrder;

 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;

 import java.util.HashMap;

@@ -13,14 +12,13 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import ch.pizzalink.android.R;
-import ch.pizzalink.android.activity.OrderActivity;
+import ch.pizzalink.android.activity.CreateOrderActivity;
 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 ch.pizzalink.android.view.PizzalinkInfoView;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -30,7 +28,7 @@ import retrofit2.Response;
 * Created by cimenmus on 17/10/2017.
 */

-public class OrderSummaryFragment extends OrderBaseFragment {
+public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {

    @BindView(R.id.orderPersonFullnamePizzalinkInfoLayout) PizzalinkInfoView orderPersonFullnamePizzalinkInfoLayout;
    @BindView(R.id.orderShippingMethodPizzalinkInfoLayout) PizzalinkInfoView orderShippingMethodPizzalinkInfoLayout;
@@ -41,12 +39,12 @@ public class OrderSummaryFragment extends OrderBaseFragment {
    @BindString(R.string.confirm_order) String confirmOrderText;

    public static final java.lang.String FRAGMENT_NAME = "orderSummaryFragment";
-    private OrderActivity orderActivity;
+    private CreateOrderActivity createOrderActivity;

-    public OrderSummaryFragment() {}
+    public CreateOrderSummaryFragment() {}

-    public static OrderSummaryFragment newInstance() {
-        return new OrderSummaryFragment();
+    public static CreateOrderSummaryFragment newInstance() {
+        return new CreateOrderSummaryFragment();
    }

    @Override
@@ -56,7 +54,7 @@ public class OrderSummaryFragment extends OrderBaseFragment {

    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_order_summary, container, false);
+        View view = inflater.inflate(R.layout.fragment_create_order_summary, container, false);
        ButterKnife.bind(this, view);
        initViews();
        return view;
@@ -64,10 +62,10 @@ public class OrderSummaryFragment extends OrderBaseFragment {

    @OnClick({R.id.previousTextView, R.id.nextTextView})
    protected void onClick(View view){
-        OrderActivity orderActivity = (OrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
        switch (view.getId()){
            case R.id.previousTextView:
-                orderActivity.onPreviousClicked(FRAGMENT_NAME);
+                createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
                break;
            case R.id.nextTextView:
                createOrder();
@@ -79,13 +77,13 @@ public class OrderSummaryFragment extends OrderBaseFragment {

        nextTextView.setText(confirmOrderText);

-        orderActivity = (OrderActivity) getActivity();
+        createOrderActivity = (CreateOrderActivity) getActivity();

        orderPersonFullnamePizzalinkInfoLayout.setText(SessionHelper.getUser().getFullname());
-        orderShippingMethodPizzalinkInfoLayout.setText(orderActivity.getSelectedShippingMethod().getTitle());
-        orderShippingAddressPizzalinkInfoLayout.setText(orderActivity.getSelectedShippingAddress().getAddress());
-        orderPaymentMethodPizzalinkInfoLayout.setText(orderActivity.getSelectedPaymentMethod().getTitle());
-        orderTotalPizzalinkInfoLayout.setText(orderActivity.getCartInfo().getTotals().get(0).getText());
+        orderShippingMethodPizzalinkInfoLayout.setText(createOrderActivity.getSelectedShippingMethod().getTitle());
+        orderShippingAddressPizzalinkInfoLayout.setText(createOrderActivity.getSelectedShippingAddress().getAddress());
+        orderPaymentMethodPizzalinkInfoLayout.setText(createOrderActivity.getSelectedPaymentMethod().getTitle());
+        orderTotalPizzalinkInfoLayout.setText(createOrderActivity.getCartInfo().getTotals().get(0).getText());
    }

    private void createOrder(){
@@ -97,7 +95,7 @@ public class OrderSummaryFragment extends OrderBaseFragment {
            public void onResponse(Call<ResponseObject<Integer>> call, Response<ResponseObject<Integer>> response) {
                DialogHelper.hideLoadingDialog();
                if(response.isSuccessful() && response.body().isSuccess()){
-                    orderActivity.onNextClicked(FRAGMENT_NAME);
+                    createOrderActivity.onNextClicked(FRAGMENT_NAME);
                }
                else{
                    ApiErrorUtils.parseError(response);
@@ -115,11 +113,11 @@ public class OrderSummaryFragment extends OrderBaseFragment {
    private HashMap<String, Object> getCreateOrderParams(){
        HashMap<String, Object> 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());
+        params.put("shipping_method_title", createOrderActivity.getSelectedShippingMethod().getTitle());
+        params.put("shipping_method_code", createOrderActivity.getSelectedShippingMethod().getCode());
+        params.put("address_id", createOrderActivity.getSelectedShippingAddress().getId());
+        params.put("payment_method_title", createOrderActivity.getSelectedPaymentMethod().getTitle());
+        params.put("payment_method_code", createOrderActivity.getSelectedPaymentMethod().getCode());
        return params;
    }
 }
--- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java
@@ -1,4 +1,4 @@
-package ch.pizzalink.android.fragment.order;
+package ch.pizzalink.android.fragment.createOrder;

 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
@@ -15,13 +15,11 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.activity.BaseActivity;
-import ch.pizzalink.android.activity.OrderActivity;
+import ch.pizzalink.android.activity.CreateOrderActivity;
 import ch.pizzalink.android.adapter.recycler.PaymentMethodsRecyclerAdapter;
 import ch.pizzalink.android.api.ApiErrorUtils;
 import ch.pizzalink.android.api.ApiService;
-import ch.pizzalink.android.api.ResponseArray;
 import ch.pizzalink.android.api.ResponseObject;
-import ch.pizzalink.android.fragment.BaseFragment;
 import ch.pizzalink.android.helper.DialogHelper;
 import ch.pizzalink.android.helper.SessionHelper;
 import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
@@ -35,7 +33,7 @@ import retrofit2.Response;
 * Created by cimenmus on 17/10/2017.
 */

-public class PaymentMethodFragment extends OrderBaseFragment {
+public class PaymentMethodFragment extends CreateOrderBaseFragment {

    @BindView(R.id.paymentMethodsRecyclerView) RecyclerView paymentMethodsRecyclerView;

@@ -70,10 +68,10 @@ public class PaymentMethodFragment extends OrderBaseFragment {

    @OnClick({R.id.previousTextView, R.id.nextTextView})
    protected void onClick(View view){
-        OrderActivity orderActivity = (OrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
        switch (view.getId()){
            case R.id.previousTextView:
-                orderActivity.onPreviousClicked(FRAGMENT_NAME);
+                createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
                break;
            case R.id.nextTextView:

@@ -81,8 +79,8 @@ public class PaymentMethodFragment extends OrderBaseFragment {
                    DialogHelper.showAlertDialog(BaseActivity.currentActivity, choosePaymentMethodText);
                    break;
                }
-                orderActivity.setSelectedPaymentMethod(selectedPaymentMethod);
-                orderActivity.onNextClicked(FRAGMENT_NAME);
+                createOrderActivity.setSelectedPaymentMethod(selectedPaymentMethod);
+                createOrderActivity.onNextClicked(FRAGMENT_NAME);
                break;
        }
    }
--- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingAddressFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingAddressFragment.java
@@ -1,4 +1,4 @@
-package ch.pizzalink.android.fragment.order;
+package ch.pizzalink.android.fragment.createOrder;

 import android.content.Intent;
 import android.os.Bundle;
@@ -18,12 +18,11 @@ import butterknife.OnClick;
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.activity.AddAddressActivity;
 import ch.pizzalink.android.activity.BaseActivity;
-import ch.pizzalink.android.activity.OrderActivity;
+import ch.pizzalink.android.activity.CreateOrderActivity;
 import ch.pizzalink.android.adapter.recycler.ShippingAddressesRecyclerAdapter;
 import ch.pizzalink.android.api.ApiErrorUtils;
 import ch.pizzalink.android.api.ApiService;
 import ch.pizzalink.android.api.ResponseArray;
-import ch.pizzalink.android.fragment.BaseFragment;
 import ch.pizzalink.android.helper.DialogHelper;
 import ch.pizzalink.android.helper.SessionHelper;
 import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
@@ -38,7 +37,7 @@ import static android.app.Activity.RESULT_OK;
 * Created by cimenmus on 17/10/2017.
 */

-public class ShippingAddressFragment extends OrderBaseFragment {
+public class ShippingAddressFragment extends CreateOrderBaseFragment {

    @BindView(R.id.shippingAddressesRecyclerView) RecyclerView shippingAddressesRecyclerView;
    @BindView(R.id.addNewAddressButton) Button addNewAddressButton;
@@ -86,7 +85,7 @@ public class ShippingAddressFragment extends OrderBaseFragment {

    @OnClick({R.id.addNewAddressButton, R.id.previousTextView, R.id.nextTextView})
    protected void onClick(View view){
-        OrderActivity orderActivity = (OrderActivity) getActivity();
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
        switch (view.getId()){
            case R.id.addNewAddressButton:
                Intent addNewAddressIntent = new Intent(BaseActivity.currentActivity,
@@ -94,7 +93,7 @@ public class ShippingAddressFragment extends OrderBaseFragment {
                startActivityForResult(addNewAddressIntent, REQUEST_CODE_ADD_NEW_ADDRESS);
                break;
            case R.id.previousTextView:
-                orderActivity.onPreviousClicked(FRAGMENT_NAME);
+                createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
                break;
            case R.id.nextTextView:

@@ -103,8 +102,8 @@ public class ShippingAddressFragment extends OrderBaseFragment {
                    return;
                }

-                orderActivity.setSelectedShippingAddress(selectedAddress);
-                orderActivity.onNextClicked(FRAGMENT_NAME);
+                createOrderActivity.setSelectedShippingAddress(selectedAddress);
+                createOrderActivity.onNextClicked(FRAGMENT_NAME);
                break;
        }
    }
--- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingMethodFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingMethodFragment.java
@@ -1,4 +1,4 @@
-package ch.pizzalink.android.fragment.order;
+package ch.pizzalink.android.fragment.createOrder;

 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
@@ -6,7 +6,6 @@ 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;

@@ -16,18 +15,15 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.activity.BaseActivity;
-import ch.pizzalink.android.activity.OrderActivity;
+import ch.pizzalink.android.activity.CreateOrderActivity;
 import ch.pizzalink.android.adapter.recycler.ShippingMethodsRecyclerAdapter;
 import ch.pizzalink.android.api.ApiErrorUtils;
 import ch.pizzalink.android.api.ApiService;
 import ch.pizzalink.android.api.ResponseArray;
-import ch.pizzalink.android.api.ResponseObject;
-import ch.pizzalink.android.fragment.BaseFragment;
 import ch.pizzalink.android.helper.DialogHelper;
 import ch.pizzalink.android.helper.SessionHelper;
 import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
 import ch.pizzalink.android.model.ShippingMethodModel;
-import ch.pizzalink.android.model.ShippingMethodsResponseModel;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -36,7 +32,7 @@ import retrofit2.Response;
 * Created by cimenmus on 17/10/2017.
 */

-public class ShippingMethodFragment extends OrderBaseFragment {
+public class ShippingMethodFragment extends CreateOrderBaseFragment {

    @BindView(R.id.shippingMethodsRecyclerView) RecyclerView shippingMethodsRecyclerView;

@@ -77,9 +73,9 @@ public class ShippingMethodFragment extends OrderBaseFragment {
            return;
        }

-        OrderActivity orderActivity = (OrderActivity) getActivity();
-        orderActivity.setSelectedShippingMethod(selectedShippingMethodModel);
-        orderActivity.onNextClicked(FRAGMENT_NAME);
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        createOrderActivity.setSelectedShippingMethod(selectedShippingMethodModel);
+        createOrderActivity.onNextClicked(FRAGMENT_NAME);
    }

    private void initViews(){
--- a/app/src/main/java/ch/pizzalink/android/helper/PriceHelper.java
+++ b/app/src/main/java/ch/pizzalink/android/helper/PriceHelper.java
@@ -81,7 +81,7 @@ public class PriceHelper {

    public static String getProductOptionPriceText(MenuProductOptionValueModel productOptionValueModel){
        return new StringBuilder()
-                //.append(productOptionValueModel.getPrice_prefix())
+                .append(productOptionValueModel.getPrice_prefix())
                .append(" ")
                .append(BaseActivity.currentActivity.getString(R.string.chf))
                .append(" ")
--- a/app/src/main/java/ch/pizzalink/android/helper/TextHelper.java
+++ b/app/src/main/java/ch/pizzalink/android/helper/TextHelper.java
@@ -1,5 +1,8 @@
 package ch.pizzalink.android.helper;

+import android.text.Html;
+import android.widget.TextView;
+
 public class TextHelper {

    public static String parseDate(String pureDate, boolean shouldShowTime){
@@ -24,4 +27,15 @@ public class TextHelper {

        return day + "." + month + "." + year + "    " + "Saat  " + time;
    }
+
+    @SuppressWarnings("deprecation")
+    public static void setTextFromHTML(TextView textView, String html) {
+
+        if (android.os.Build.VERSION.SDK_INT >= 24)
+            textView.setText(Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY));
+        else
+            textView.setText(Html.fromHtml(html));
+
+    }
+
 }