order history details

2017-11-22 22:25:16 +03:00
parent 334171c8ca
commit 47136dde71
15 changed files with 1182 additions and 434 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

 android {
    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    buildToolsVersion "26.0.2"
    defaultConfig {
        applicationId "ch.pizzalink.android"
        minSdkVersion 16
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
        <activity
            android:name=".activity.UpdateProfileActivity"
            android:screenOrientation="portrait" />
-        <activity android:name=".activity.ProductPropertiesActivity"></activity>
+        <activity android:name=".activity.ProductPropertiesActivity" />
+        <activity android:name=".activity.OrderHistoryDetailsActivity"></activity>
    </application>

 </manifest>
--- a/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java
@@ -10,14 +10,12 @@ import android.support.v4.widget.DrawerLayout;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

@@ -33,8 +31,8 @@ import butterknife.ButterKnife;
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.adapter.recycler.NavigationMenuRecyclerAdapter;
 import ch.pizzalink.android.fragment.CartFragment;
+import ch.pizzalink.android.fragment.OrderHistoryFragment;
 import ch.pizzalink.android.fragment.StoreInfoFragment;
-import ch.pizzalink.android.fragment.HistoryFragment;
 import ch.pizzalink.android.fragment.MenuFragment;
 import ch.pizzalink.android.fragment.ProductFragment;
 import ch.pizzalink.android.fragment.ProfileFragment;
@@ -45,8 +43,6 @@ import ch.pizzalink.android.view.PizzalinkToolbar;
 import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
 import io.github.luizgrp.sectionedrecyclerviewadapter.SectionedRecyclerViewAdapter;
 import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection;
-import q.rorbin.badgeview.Badge;
-import q.rorbin.badgeview.QBadgeView;

 public class MainActivity extends BaseActivity {

@@ -204,10 +200,10 @@ public class MainActivity extends BaseActivity {
                        return true;

                    case R.id.action_history:
-                        if (currentFragmentName.equals(HistoryFragment.FRAGMENT_NAME))
+                        if (currentFragmentName.equals(OrderHistoryFragment.FRAGMENT_NAME))
                            return true;
-                        fragmentManager.beginTransaction().replace(R.id.fragmentContainer, HistoryFragment.newInstance()).commit();
-                        currentFragmentName = HistoryFragment.FRAGMENT_NAME;
+                        fragmentManager.beginTransaction().replace(R.id.fragmentContainer, OrderHistoryFragment.newInstance()).commit();
+                        currentFragmentName = OrderHistoryFragment.FRAGMENT_NAME;

                        currentCategoryId = -1;

--- a/app/src/main/java/ch/pizzalink/android/activity/OrderHistoryDetailsActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/OrderHistoryDetailsActivity.java
@@ -0,0 +1,91 @@
+package ch.pizzalink.android.activity;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import ch.pizzalink.android.R;
+import ch.pizzalink.android.helper.PriceHelper;
+import ch.pizzalink.android.model.OrderHistoryModel;
+import ch.pizzalink.android.view.PizzalinkInfoView;
+
+public class OrderHistoryDetailsActivity extends BaseActivity {
+
+    @BindView(R.id.orderDatePizzalinkInfoLayout) PizzalinkInfoView orderDatePizzalinkInfoLayout;
+    @BindView(R.id.orderStatusPizzalinkInfoLayout) PizzalinkInfoView orderStatusPizzalinkInfoLayout;
+    @BindView(R.id.orderShippingTimePizzalinkInfoLayout) PizzalinkInfoView orderShippingTimePizzalinkInfoLayout;
+    @BindView(R.id.orderTotalPizzalinkInfoLayout) PizzalinkInfoView orderTotalPizzalinkInfoLayout;
+    @BindView(R.id.orderPaymentMethodPizzalinkInfoLayout) PizzalinkInfoView orderPaymentMethodPizzalinkInfoLayout;
+    @BindView(R.id.orderFullnamePizzalinkInfoLayout) PizzalinkInfoView orderFullnamePizzalinkInfoLayout;
+    @BindView(R.id.orderShippingMethodPizzalinkInfoLayout) PizzalinkInfoView orderShippingMethodPizzalinkInfoLayout;
+    @BindView(R.id.orderShippingAddressPizzalinkInfoLayout) PizzalinkInfoView orderShippingAddressPizzalinkInfoLayout;
+    @BindView(R.id.orderNotePizzalinkInfoLayout) PizzalinkInfoView orderNotePizzalinkInfoLayout;
+
+    private OrderHistoryModel orderHistoryModel;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_order_history_details);
+        ButterKnife.bind(this);
+        getDataFromIntent();
+        initViews();
+    }
+
+    private void getDataFromIntent(){
+        orderHistoryModel = (OrderHistoryModel) getIntent().getSerializableExtra("orderHistoryModel");
+    }
+
+    private void initViews(){
+        orderDatePizzalinkInfoLayout.setText(orderHistoryModel.getFormattedCreateDate());
+        orderStatusPizzalinkInfoLayout.setText(orderHistoryModel.getStatus());
+        if(orderHistoryModel.getShippingTime().isEmpty()){
+            orderShippingTimePizzalinkInfoLayout.setVisibility(View.GONE);
+        }
+        else {
+            orderShippingTimePizzalinkInfoLayout.setText(orderHistoryModel.getShippingTime());
+        }
+        orderTotalPizzalinkInfoLayout.setText(PriceHelper.roundFractions(orderHistoryModel.getTotalString()));
+        orderPaymentMethodPizzalinkInfoLayout.setText(orderHistoryModel.getPaymentMethod());
+        orderFullnamePizzalinkInfoLayout.setText(orderHistoryModel.getFirstname() + " " + orderHistoryModel.getLastname());
+        orderShippingMethodPizzalinkInfoLayout.setText(orderHistoryModel.getShippingMethod());
+        orderShippingAddressPizzalinkInfoLayout.setText(createAddress());
+        if(orderHistoryModel.getComment().isEmpty()){
+            orderNotePizzalinkInfoLayout.setVisibility(View.GONE);
+        }
+        else {
+            orderNotePizzalinkInfoLayout.setText(orderHistoryModel.getComment());
+        }
+    }
+
+    private String createAddress(){
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder
+                .append(orderHistoryModel.getFirstname())
+                .append(" ")
+                .append(orderHistoryModel.getLastname())
+                .append("\n");
+
+        if(!orderHistoryModel.getPaymentAddress1().isEmpty()){
+            stringBuilder
+                    .append(orderHistoryModel.getShippingAddress1())
+                    .append("\n");
+        }
+
+        if(!orderHistoryModel.getShippingAddress2().isEmpty()){
+            stringBuilder
+                    .append(orderHistoryModel.getShippingAddress2())
+                    .append("\n");
+        }
+         stringBuilder
+                 .append(orderHistoryModel.getShippingPostcode())
+                .append(" ")
+                .append(orderHistoryModel.getShippingCity())
+                .append("\n")
+                .append(orderHistoryModel.getShippingCountry());
+
+        return stringBuilder.toString();
+    }
+}
--- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java
+++ b/app/src/main/java/ch/pizzalink/android/adapter/recycler/OrderHistoryRecyclerAdapter.java
@@ -4,7 +4,6 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;

 import java.util.ArrayList;
@@ -14,7 +13,7 @@ import butterknife.ButterKnife;
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.helper.PriceHelper;
 import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
-import ch.pizzalink.android.model.OrderModel;
+import ch.pizzalink.android.model.OrderHistoryModel;

 /**
 * Created by cimenmus on 04/10/2017.
@@ -25,7 +24,7 @@ public class OrderHistoryRecyclerAdapter extends RecyclerView.Adapter<RecyclerVi
    private final int HOLDER_ORDER = 0;
    private final int HOLDER_SPACE = 1;

-    private ArrayList<OrderModel> orderHistoryList = new ArrayList<>();
+    private ArrayList<OrderHistoryModel> orderHistoryList = new ArrayList<>();
    private RecyclerItemClickListener recyclerItemClickListener;

    public static class OrderViewHolder extends RecyclerView.ViewHolder {
@@ -37,6 +36,14 @@ public class OrderHistoryRecyclerAdapter extends RecyclerView.Adapter<RecyclerVi
        public OrderViewHolder(final View view, final RecyclerItemClickListener recyclerItemClickListener) {
            super(view);
            ButterKnife.bind(this, view);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if(recyclerItemClickListener != null){
+                        recyclerItemClickListener.onItemClick(view, getAdapterPosition());
+                    }
+                }
+            });
        }
    }

@@ -55,7 +62,7 @@ public class OrderHistoryRecyclerAdapter extends RecyclerView.Adapter<RecyclerVi
        return HOLDER_ORDER;
    }

-    public OrderHistoryRecyclerAdapter(ArrayList<OrderModel> orderHistoryList,
+    public OrderHistoryRecyclerAdapter(ArrayList<OrderHistoryModel> orderHistoryList,
                                RecyclerItemClickListener recyclerItemClickListener){
        this.orderHistoryList = orderHistoryList;
        this.recyclerItemClickListener = recyclerItemClickListener;
@@ -113,11 +120,11 @@ public class OrderHistoryRecyclerAdapter extends RecyclerView.Adapter<RecyclerVi
        return orderHistoryList.size() + 1 ;
    }

-    private String createOrderInfoText(OrderModel orderModel){
+    private String createOrderInfoText(OrderHistoryModel orderHistoryModel){
        return new StringBuilder()
-                .append(orderModel.getFormattedCreateDate())
+                .append(orderHistoryModel.getFormattedCreateDate())
                .append("\n\n")
-                .append(orderModel.getStatus())
+                .append(orderHistoryModel.getStatus())
                .toString();
    }

--- a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java
+++ b/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java
@@ -16,7 +16,7 @@ import ch.pizzalink.android.model.CityModel;
 import ch.pizzalink.android.model.ZoneModel;
 import ch.pizzalink.android.model.cart.CartInfoModel;
 import ch.pizzalink.android.model.CategoryModel;
-import ch.pizzalink.android.model.OrderModel;
+import ch.pizzalink.android.model.OrderHistoryModel;
 import ch.pizzalink.android.model.UserModel;
 import ch.pizzalink.android.model.menu.MenuProductModel;
 import retrofit2.Call;
@@ -53,7 +53,7 @@ public interface ApiInterface {
    Call<ResponseObject> logout(@Field("token") String customerToken);

    @GET(ApiEndPoints.API_GET_ORDER_HISTORY)
-    Call<ResponseArray<OrderModel>> getOrderHistory(@Query("token") String token);
+    Call<ResponseArray<OrderHistoryModel>> getOrderHistory(@Query("token") String token);

    @GET(ApiEndPoints.API_GET_CART_PRODUCTS)
    Call<ResponseObject<CartInfoModel>> getCartProducts(@Query("token") String token);
--- a/app/src/main/java/ch/pizzalink/android/fragment/OrderHistoryFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/OrderHistoryFragment.java
@@ -1,22 +1,21 @@
 package ch.pizzalink.android.fragment;

+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;

 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Objects;

 import butterknife.BindString;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.activity.BaseActivity;
+import ch.pizzalink.android.activity.OrderHistoryDetailsActivity;
 import ch.pizzalink.android.adapter.recycler.OrderHistoryRecyclerAdapter;
 import ch.pizzalink.android.api.ApiErrorUtils;
 import ch.pizzalink.android.api.ApiService;
@@ -24,7 +23,7 @@ import ch.pizzalink.android.api.ResponseArray;
 import ch.pizzalink.android.helper.DialogHelper;
 import ch.pizzalink.android.helper.SessionHelper;
 import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
-import ch.pizzalink.android.model.OrderModel;
+import ch.pizzalink.android.model.OrderHistoryModel;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -33,7 +32,7 @@ import retrofit2.Response;
 * Created by cimenmus on 20/09/2017.
 */

-public class HistoryFragment extends BaseFragment {
+public class OrderHistoryFragment extends BaseFragment {

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

@@ -41,13 +40,13 @@ public class HistoryFragment extends BaseFragment {

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

-    private ArrayList<OrderModel> orderHistoryList = new ArrayList<>();
+    private ArrayList<OrderHistoryModel> orderHistoryList = new ArrayList<>();
    private OrderHistoryRecyclerAdapter orderHistoryRecyclerAdapter;

-    public HistoryFragment() {}
+    public OrderHistoryFragment() {}

-    public static HistoryFragment newInstance() {
-        return new HistoryFragment();
+    public static OrderHistoryFragment newInstance() {
+        return new OrderHistoryFragment();
    }

    @Override
@@ -57,7 +56,7 @@ public class HistoryFragment extends BaseFragment {

    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_history, container, false);
+        View view = inflater.inflate(R.layout.fragment_order_history, container, false);
        ButterKnife.bind(this, view);
        initViews();
        getOrderHistory();
@@ -73,7 +72,9 @@ public class HistoryFragment extends BaseFragment {
        orderHistoryRecyclerAdapter = new OrderHistoryRecyclerAdapter(orderHistoryList, new RecyclerItemClickListener() {
            @Override
            public void onItemClick(View view, int position) {
-
+                Intent orderHistoryDetailsIntent = new Intent(BaseActivity.currentActivity, OrderHistoryDetailsActivity.class);
+                orderHistoryDetailsIntent.putExtra("orderHistoryModel", orderHistoryList.get(position));
+                startActivity(orderHistoryDetailsIntent);
            }
        });
        LinearLayoutManager layoutManager = new LinearLayoutManager(BaseActivity.currentActivity);
@@ -112,11 +113,11 @@ public class HistoryFragment extends BaseFragment {

    private void getOrderHistory(){
        DialogHelper.showLoadingDialog();
-        Call<ResponseArray<OrderModel>> call = ApiService.apiInterface.
+        Call<ResponseArray<OrderHistoryModel>> call = ApiService.apiInterface.
                getOrderHistory(SessionHelper.getCustomerToken().getToken());
-        call.enqueue(new Callback<ResponseArray<OrderModel>>() {
+        call.enqueue(new Callback<ResponseArray<OrderHistoryModel>>() {
            @Override
-            public void onResponse(Call<ResponseArray<OrderModel>> call, Response<ResponseArray<OrderModel>> response) {
+            public void onResponse(Call<ResponseArray<OrderHistoryModel>> call, Response<ResponseArray<OrderHistoryModel>> response) {
                DialogHelper.hideLoadingDialog();
                if(response.isSuccessful() &&
                        response.body().getData() != null &&
@@ -127,15 +128,15 @@ public class HistoryFragment extends BaseFragment {
            }

            @Override
-            public void onFailure(Call<ResponseArray<OrderModel>> call, Throwable t) {
+            public void onFailure(Call<ResponseArray<OrderHistoryModel>> call, Throwable t) {
                DialogHelper.hideLoadingDialog();
                DialogHelper.showFailedDialog();
            }
        });
    }

-    private void fillAndNotifyOrderHistoryList(ArrayList<OrderModel> orderList){
-        OrderModel.checkNull(orderList);
+    private void fillAndNotifyOrderHistoryList(ArrayList<OrderHistoryModel> orderList){
+        OrderHistoryModel.checkNull(orderList);
        orderHistoryList.clear();
        orderHistoryList.addAll(orderList);
        orderHistoryRecyclerAdapter.notifyDataSetChanged();
--- a/app/src/main/java/ch/pizzalink/android/model/OrderHistoryModel.java
+++ b/app/src/main/java/ch/pizzalink/android/model/OrderHistoryModel.java
@@ -0,0 +1,759 @@
+package ch.pizzalink.android.model;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+import ch.pizzalink.android.helper.DateTimeHelper;
+
+/**
+ * Created by cimenmus on 04/10/2017.
+ */public class OrderHistoryModel implements Serializable {
+
+    @SerializedName("order_id")
+    @Expose
+    private String id;
+    @SerializedName("invoice_no")
+    @Expose
+    private String invoiceNo;
+    @SerializedName("invoice_prefix")
+    @Expose
+    private String invoicePrefix;
+    @SerializedName("store_id")
+    @Expose
+    private String storeId;
+    @SerializedName("store_name")
+    @Expose
+    private String storeName;
+    @SerializedName("store_url")
+    @Expose
+    private String storeUrl;
+    @SerializedName("customer_id")
+    @Expose
+    private String customerId;
+    @SerializedName("customer_group_id")
+    @Expose
+    private String customerGroupId;
+    @SerializedName("firstname")
+    @Expose
+    private String firstname;
+    @SerializedName("lastname")
+    @Expose
+    private String lastname;
+    @SerializedName("email")
+    @Expose
+    private String email;
+    @SerializedName("telephone")
+    @Expose
+    private String telephone;
+    @SerializedName("fax")
+    @Expose
+    private String fax;
+    @SerializedName("custom_field")
+    @Expose
+    private String customField;
+    @SerializedName("payment_firstname")
+    @Expose
+    private String paymentFirstname;
+    @SerializedName("payment_lastname")
+    @Expose
+    private String paymentLastname;
+    @SerializedName("payment_company")
+    @Expose
+    private String paymentCompany;
+    @SerializedName("payment_address_1")
+    @Expose
+    private String paymentAddress1;
+    @SerializedName("payment_address_2")
+    @Expose
+    private String paymentAddress2;
+    @SerializedName("payment_city")
+    @Expose
+    private String paymentCity;
+    @SerializedName("payment_postcode")
+    @Expose
+    private String paymentPostcode;
+    @SerializedName("payment_country")
+    @Expose
+    private String paymentCountry;
+    @SerializedName("payment_country_id")
+    @Expose
+    private String paymentCountryId;
+    @SerializedName("payment_zone")
+    @Expose
+    private String paymentZone;
+    @SerializedName("payment_zone_id")
+    @Expose
+    private String paymentZoneId;
+    @SerializedName("payment_address_format")
+    @Expose
+    private String paymentAddressFormat;
+    @SerializedName("payment_custom_field")
+    @Expose
+    private String paymentCustomField;
+    @SerializedName("payment_method")
+    @Expose
+    private String paymentMethod;
+    @SerializedName("payment_code")
+    @Expose
+    private String paymentCode;
+    @SerializedName("shipping_firstname")
+    @Expose
+    private String shippingFirstname;
+    @SerializedName("shipping_lastname")
+    @Expose
+    private String shippingLastname;
+    @SerializedName("shipping_company")
+    @Expose
+    private String shippingCompany;
+    @SerializedName("shipping_address_1")
+    @Expose
+    private String shippingAddress1;
+    @SerializedName("shipping_address_2")
+    @Expose
+    private String shippingAddress2;
+    @SerializedName("shipping_city")
+    @Expose
+    private String shippingCity;
+    @SerializedName("shipping_postcode")
+    @Expose
+    private String shippingPostcode;
+    @SerializedName("shipping_country")
+    @Expose
+    private String shippingCountry;
+    @SerializedName("shipping_country_id")
+    @Expose
+    private String shippingCountryId;
+    @SerializedName("shipping_zone")
+    @Expose
+    private String shippingZone;
+    @SerializedName("shipping_zone_id")
+    @Expose
+    private String shippingZoneId;
+    @SerializedName("shipping_address_format")
+    @Expose
+    private String shippingAddressFormat;
+    @SerializedName("shipping_custom_field")
+    @Expose
+    private String shippingCustomField;
+    @SerializedName("shipping_method")
+    @Expose
+    private String shippingMethod;
+    @SerializedName("shipping_code")
+    @Expose
+    private String shippingCode;
+    @SerializedName("comment")
+    @Expose
+    private String comment;
+    @SerializedName("total")
+    @Expose
+    private String total;
+    @SerializedName("order_status_id")
+    @Expose
+    private String orderStatusId;
+    @SerializedName("affiliate_id")
+    @Expose
+    private String affiliateId;
+    @SerializedName("commission")
+    @Expose
+    private String commission;
+    @SerializedName("marketing_id")
+    @Expose
+    private String marketingId;
+    @SerializedName("tracking")
+    @Expose
+    private String tracking;
+    @SerializedName("language_id")
+    @Expose
+    private String languageId;
+    @SerializedName("currency_id")
+    @Expose
+    private String currencyId;
+    @SerializedName("currency_code")
+    @Expose
+    private String currencyCode;
+    @SerializedName("currency_value")
+    @Expose
+    private String currencyValue;
+    @SerializedName("ip")
+    @Expose
+    private String ip;
+    @SerializedName("forwarded_ip")
+    @Expose
+    private String forwardedIp;
+    @SerializedName("user_agent")
+    @Expose
+    private String userAgent;
+    @SerializedName("accept_language")
+    @Expose
+    private String acceptLanguage;
+    @SerializedName("date_added")
+    @Expose
+    private String createDate;
+    @SerializedName("date_modified")
+    @Expose
+    private String dateModified;
+    @SerializedName("shipping_time")
+    @Expose
+    private String shippingTime;
+    @SerializedName("status")
+    @Expose
+    private String status;
+
+    public int getTotalInt(){
+        try {
+            return Integer.valueOf(total);
+        }catch (Exception e){
+            return 0;
+        }
+    }
+
+    public String getTotalString(){
+        return currencyCode + " " + total;
+    }
+
+    public String getFormattedCreateDate(){
+        return DateTimeHelper.getFormattedDateFromDateString(createDate);
+    }
+
+    private void checkNull(){
+
+        if(id == null)
+            id = "";
+
+        if(createDate == null)
+            createDate = "";
+
+        if(currencyCode == null)
+            currencyCode = "";
+
+        if(currencyValue == null)
+            currencyValue = "";
+
+        if(firstname == null)
+            firstname = "";
+
+        if(lastname == null)
+            lastname = "";
+
+        if(status == null)
+            status = "";
+
+        if(total == null)
+            total = "";
+    }
+
+    public static void checkNull(ArrayList<OrderHistoryModel> orderHistoryList){
+        for(OrderHistoryModel orderHistoryModel : orderHistoryList){
+            orderHistoryModel.checkNull();
+        }
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getInvoiceNo() {
+        return invoiceNo;
+    }
+
+    public void setInvoiceNo(String invoiceNo) {
+        this.invoiceNo = invoiceNo;
+    }
+
+    public String getInvoicePrefix() {
+        return invoicePrefix;
+    }
+
+    public void setInvoicePrefix(String invoicePrefix) {
+        this.invoicePrefix = invoicePrefix;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreUrl() {
+        return storeUrl;
+    }
+
+    public void setStoreUrl(String storeUrl) {
+        this.storeUrl = storeUrl;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerGroupId() {
+        return customerGroupId;
+    }
+
+    public void setCustomerGroupId(String customerGroupId) {
+        this.customerGroupId = customerGroupId;
+    }
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public void setFirstname(String firstname) {
+        this.firstname = firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public void setLastname(String lastname) {
+        this.lastname = lastname;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getCustomField() {
+        return customField;
+    }
+
+    public void setCustomField(String customField) {
+        this.customField = customField;
+    }
+
+    public String getPaymentFirstname() {
+        return paymentFirstname;
+    }
+
+    public void setPaymentFirstname(String paymentFirstname) {
+        this.paymentFirstname = paymentFirstname;
+    }
+
+    public String getPaymentLastname() {
+        return paymentLastname;
+    }
+
+    public void setPaymentLastname(String paymentLastname) {
+        this.paymentLastname = paymentLastname;
+    }
+
+    public String getPaymentCompany() {
+        return paymentCompany;
+    }
+
+    public void setPaymentCompany(String paymentCompany) {
+        this.paymentCompany = paymentCompany;
+    }
+
+    public String getPaymentAddress1() {
+        return paymentAddress1;
+    }
+
+    public void setPaymentAddress1(String paymentAddress1) {
+        this.paymentAddress1 = paymentAddress1;
+    }
+
+    public String getPaymentAddress2() {
+        return paymentAddress2;
+    }
+
+    public void setPaymentAddress2(String paymentAddress2) {
+        this.paymentAddress2 = paymentAddress2;
+    }
+
+    public String getPaymentCity() {
+        return paymentCity;
+    }
+
+    public void setPaymentCity(String paymentCity) {
+        this.paymentCity = paymentCity;
+    }
+
+    public String getPaymentPostcode() {
+        return paymentPostcode;
+    }
+
+    public void setPaymentPostcode(String paymentPostcode) {
+        this.paymentPostcode = paymentPostcode;
+    }
+
+    public String getPaymentCountry() {
+        return paymentCountry;
+    }
+
+    public void setPaymentCountry(String paymentCountry) {
+        this.paymentCountry = paymentCountry;
+    }
+
+    public String getPaymentCountryId() {
+        return paymentCountryId;
+    }
+
+    public void setPaymentCountryId(String paymentCountryId) {
+        this.paymentCountryId = paymentCountryId;
+    }
+
+    public String getPaymentZone() {
+        return paymentZone;
+    }
+
+    public void setPaymentZone(String paymentZone) {
+        this.paymentZone = paymentZone;
+    }
+
+    public String getPaymentZoneId() {
+        return paymentZoneId;
+    }
+
+    public void setPaymentZoneId(String paymentZoneId) {
+        this.paymentZoneId = paymentZoneId;
+    }
+
+    public String getPaymentAddressFormat() {
+        return paymentAddressFormat;
+    }
+
+    public void setPaymentAddressFormat(String paymentAddressFormat) {
+        this.paymentAddressFormat = paymentAddressFormat;
+    }
+
+    public String getPaymentCustomField() {
+        return paymentCustomField;
+    }
+
+    public void setPaymentCustomField(String paymentCustomField) {
+        this.paymentCustomField = paymentCustomField;
+    }
+
+    public String getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(String paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    public String getPaymentCode() {
+        return paymentCode;
+    }
+
+    public void setPaymentCode(String paymentCode) {
+        this.paymentCode = paymentCode;
+    }
+
+    public String getShippingFirstname() {
+        return shippingFirstname;
+    }
+
+    public void setShippingFirstname(String shippingFirstname) {
+        this.shippingFirstname = shippingFirstname;
+    }
+
+    public String getShippingLastname() {
+        return shippingLastname;
+    }
+
+    public void setShippingLastname(String shippingLastname) {
+        this.shippingLastname = shippingLastname;
+    }
+
+    public String getShippingCompany() {
+        return shippingCompany;
+    }
+
+    public void setShippingCompany(String shippingCompany) {
+        this.shippingCompany = shippingCompany;
+    }
+
+    public String getShippingAddress1() {
+        return shippingAddress1;
+    }
+
+    public void setShippingAddress1(String shippingAddress1) {
+        this.shippingAddress1 = shippingAddress1;
+    }
+
+    public String getShippingAddress2() {
+        return shippingAddress2;
+    }
+
+    public void setShippingAddress2(String shippingAddress2) {
+        this.shippingAddress2 = shippingAddress2;
+    }
+
+    public String getShippingCity() {
+        return shippingCity;
+    }
+
+    public void setShippingCity(String shippingCity) {
+        this.shippingCity = shippingCity;
+    }
+
+    public String getShippingPostcode() {
+        return shippingPostcode;
+    }
+
+    public void setShippingPostcode(String shippingPostcode) {
+        this.shippingPostcode = shippingPostcode;
+    }
+
+    public String getShippingCountry() {
+        return shippingCountry;
+    }
+
+    public void setShippingCountry(String shippingCountry) {
+        this.shippingCountry = shippingCountry;
+    }
+
+    public String getShippingCountryId() {
+        return shippingCountryId;
+    }
+
+    public void setShippingCountryId(String shippingCountryId) {
+        this.shippingCountryId = shippingCountryId;
+    }
+
+    public String getShippingZone() {
+        return shippingZone;
+    }
+
+    public void setShippingZone(String shippingZone) {
+        this.shippingZone = shippingZone;
+    }
+
+    public String getShippingZoneId() {
+        return shippingZoneId;
+    }
+
+    public void setShippingZoneId(String shippingZoneId) {
+        this.shippingZoneId = shippingZoneId;
+    }
+
+    public String getShippingAddressFormat() {
+        return shippingAddressFormat;
+    }
+
+    public void setShippingAddressFormat(String shippingAddressFormat) {
+        this.shippingAddressFormat = shippingAddressFormat;
+    }
+
+    public String getShippingCustomField() {
+        return shippingCustomField;
+    }
+
+    public void setShippingCustomField(String shippingCustomField) {
+        this.shippingCustomField = shippingCustomField;
+    }
+
+    public String getShippingMethod() {
+        return shippingMethod;
+    }
+
+    public void setShippingMethod(String shippingMethod) {
+        this.shippingMethod = shippingMethod;
+    }
+
+    public String getShippingCode() {
+        return shippingCode;
+    }
+
+    public void setShippingCode(String shippingCode) {
+        this.shippingCode = shippingCode;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public String getTotal() {
+        return total;
+    }
+
+    public void setTotal(String total) {
+        this.total = total;
+    }
+
+    public String getOrderStatusId() {
+        return orderStatusId;
+    }
+
+    public void setOrderStatusId(String orderStatusId) {
+        this.orderStatusId = orderStatusId;
+    }
+
+    public String getAffiliateId() {
+        return affiliateId;
+    }
+
+    public void setAffiliateId(String affiliateId) {
+        this.affiliateId = affiliateId;
+    }
+
+    public String getCommission() {
+        return commission;
+    }
+
+    public void setCommission(String commission) {
+        this.commission = commission;
+    }
+
+    public String getMarketingId() {
+        return marketingId;
+    }
+
+    public void setMarketingId(String marketingId) {
+        this.marketingId = marketingId;
+    }
+
+    public String getTracking() {
+        return tracking;
+    }
+
+    public void setTracking(String tracking) {
+        this.tracking = tracking;
+    }
+
+    public String getLanguageId() {
+        return languageId;
+    }
+
+    public void setLanguageId(String languageId) {
+        this.languageId = languageId;
+    }
+
+    public String getCurrencyId() {
+        return currencyId;
+    }
+
+    public void setCurrencyId(String currencyId) {
+        this.currencyId = currencyId;
+    }
+
+    public String getCurrencyCode() {
+        return currencyCode;
+    }
+
+    public void setCurrencyCode(String currencyCode) {
+        this.currencyCode = currencyCode;
+    }
+
+    public String getCurrencyValue() {
+        return currencyValue;
+    }
+
+    public void setCurrencyValue(String currencyValue) {
+        this.currencyValue = currencyValue;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getForwardedIp() {
+        return forwardedIp;
+    }
+
+    public void setForwardedIp(String forwardedIp) {
+        this.forwardedIp = forwardedIp;
+    }
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public String getAcceptLanguage() {
+        return acceptLanguage;
+    }
+
+    public void setAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getDateModified() {
+        return dateModified;
+    }
+
+    public void setDateModified(String dateModified) {
+        this.dateModified = dateModified;
+    }
+
+    public String getShippingTime() {
+        return shippingTime;
+    }
+
+    public void setShippingTime(String shippingTime) {
+        this.shippingTime = shippingTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+}
+
--- a/app/src/main/java/ch/pizzalink/android/model/OrderModel.java
+++ b/app/src/main/java/ch/pizzalink/android/model/OrderModel.java
@@ -1,121 +0,0 @@
-package ch.pizzalink.android.model;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-import java.util.ArrayList;
-
-import ch.pizzalink.android.helper.DateTimeHelper;
-
-/**
- * Created by cimenmus on 04/10/2017.
- */
-
-public class OrderModel {
-
-    @Expose @SerializedName("order_id") private String id;
-    @Expose @SerializedName("date_added") private String createDate;
-    @Expose @SerializedName("currency_code") private String currencyCode;
-    @Expose @SerializedName("currency_value") private String currencyValue;
-    private String firstname;
-    private String lastname;
-    private String status;
-    private String total;
-
-    public int getTotalInt(){
-        try {
-            return Integer.valueOf(total);
-        }catch (Exception e){
-            return 0;
-        }
-    }
-
-    public String getTotalString(){
-        return currencyCode + " " + total;
-    }
-
-    public String getFormattedCreateDate(){
-        return DateTimeHelper.getFormattedDateFromDateString(createDate);
-    }
-
-    private void checkNull(){
-
-        if(id == null)
-            id = "";
-
-        if(createDate == null)
-            createDate = "";
-
-        if(currencyCode == null)
-            currencyCode = "";
-
-        if(currencyValue == null)
-            currencyValue = "";
-
-        if(firstname == null)
-            firstname = "";
-
-        if(lastname == null)
-            lastname = "";
-
-        if(status == null)
-            status = "";
-
-        if(total == null)
-            total = "";
-    }
-
-    public static void checkNull(ArrayList<OrderModel> orderHistoryList){
-        for(OrderModel orderModel : orderHistoryList){
-            orderModel.checkNull();
-        }
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getFirstname() {
-        return firstname;
-    }
-
-    public void setFirstname(String firstname) {
-        this.firstname = firstname;
-    }
-
-    public String getLastname() {
-        return lastname;
-    }
-
-    public void setLastname(String lastname) {
-        this.lastname = lastname;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getCurrencyCode() {
-        return currencyCode;
-    }
-
-    public void setCurrency_code(String currencyCode) {
-        this.currencyCode = currencyCode;
-    }
-
-    public String getCurrencyValue() {
-        return currencyValue;
-    }
-
-    public void setCurrencyValue(String currencyValue) {
-        this.currencyValue = currencyValue;
-    }
-}
--- a/app/src/main/res/layout/activity_order_history_details.xml
+++ b/app/src/main/res/layout/activity_order_history_details.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context="ch.pizzalink.android.activity.OrderHistoryDetailsActivity"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
+
+    <ch.pizzalink.android.view.PizzalinkToolbar
+        android:id="@+id/orderHistoryDetailsToolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/activity_title_order_history_details"
+        android:background="@color/white"
+        app:showBackIcon="true"
+        app:titleTextColor="@color/navy" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/orderHistoryDetailsToolbar">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:src="@drawable/background_wood" />
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            app:cardCornerRadius="4dp"
+            android:layout_margin="12dp">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:scrollbars="none">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:background="@color/white">
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderDatePizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_date" />
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderStatusPizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_status" />
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderShippingTimePizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_shipping_time" />
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderTotalPizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_total" />
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderPaymentMethodPizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_payment_method" />
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderFullnamePizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_fullname" />
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderShippingMethodPizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_shipping_method" />
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderShippingAddressPizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_shipping_address" />
+
+                    <ch.pizzalink.android.view.PizzalinkInfoView
+                        android:id="@+id/orderNotePizzalinkInfoLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:description="@string/order_history_order_note" />
+
+                </LinearLayout>
+
+            </ScrollView>
+
+        </android.support.v7.widget.CardView>
+
+    </RelativeLayout>
+
+</RelativeLayout>
--- a/app/src/main/res/layout/fragment_order_history.xml
+++ b/app/src/main/res/layout/fragment_order_history.xml
--- a/app/src/main/res/layout/row_order_history.xml
+++ b/app/src/main/res/layout/row_order_history.xml
@@ -50,20 +50,43 @@

        </RelativeLayout>

-        <TextView
-            android:id="@+id/orderStatusTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Pending"
-            android:textColor="@color/navy"
-            android:layout_marginLeft="32dp"
-            android:layout_marginStart="32dp"
-            fontPath="fonts/Quicksand-Regular-Italic.otf"
-            android:paddingBottom="12dp"
-            android:paddingLeft="12dp"
-            android:paddingStart="12dp"
-            android:paddingRight="12dp"
-            android:paddingEnd="12dp" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/orderStatusTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Pending"
+                android:textColor="@color/navy"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:layout_marginRight="32dp"
+                android:layout_marginEnd="32dp"
+                android:layout_toLeftOf="@+id/arrow"
+                android:layout_toStartOf="@+id/arrow"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                fontPath="fonts/Quicksand-Regular-Italic.otf"
+                android:paddingBottom="12dp"
+                android:paddingLeft="12dp"
+                android:paddingStart="12dp"
+                android:paddingRight="12dp"
+                android:paddingEnd="12dp" />
+
+            <ImageView
+                android:id="@+id/arrow"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:src="@drawable/ic_back"
+                android:tint="@color/navy"
+                android:padding="6dp"
+                android:rotation="180"/>
+
+        </RelativeLayout>

    </LinearLayout>

--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,326 +1,200 @@
 <resources>

    <!-- General-->
-    <string name="app_name">Pizzalink</string>  <!--bu alanı alanını değiştirmyin !!!-->
-        
+    <string name="app_name">Pizzalink</string>
    <string name="something_went_wrong">Es ist ein Fehler aufgetreten.</string>
-        
    <string name="alert">Warnung</string>
-        
    <string name="error_message">Es ist ein Fehler aufgetreten.</string>
-        
    <string name="bad_request">Bad Request</string>
-        
    <string name="failed">Connection failed</string>
-        
    <string name="ok">Ok</string>
-        
-    <string name="cancel">Beenden</string>
-        
-    <string name="loading">Bitte warten...</string>
-        
-    <string name="month_name_january">Jan.</string>
-        
-    <string name="month_name_february">Feb.</string>
-        
-    <string name="month_name_march">Mar.</string>
-        
-    <string name="month_name_april">Apr.</string>
-        
-    <string name="month_name_may">May</string>
-        
-    <string name="month_name_jun">June</string>
-        
-    <string name="month_name_july">July</string>
-        
-    <string name="month_name_august">Aug.</string>
-        
-    <string name="month_name_september">Sept</string>
-        
-    <string name="month_name_october">Oct.</string>
-        
-    <string name="month_name_november">Nov.</string>
-        
+    <string name="cancel">Beenden</string>    
+    <string name="loading">Bitte warten...</string>    
+    <string name="month_name_january">Jan.</string>    
+    <string name="month_name_february">Feb.</string>    
+    <string name="month_name_march">Mar.</string>    
+    <string name="month_name_april">Apr.</string>    
+    <string name="month_name_may">May</string>    
+    <string name="month_name_jun">June</string>    
+    <string name="month_name_july">July</string>  
+    <string name="month_name_august">Aug.</string>    
+    <string name="month_name_september">Sept</string>    
+    <string name="month_name_october">Oct.</string>  
+    <string name="month_name_november">Nov.</string> 
    <string name="month_name_december">Dec.</string>
-        
-    <string name="chf">CHF</string>
-        
+    <string name="chf">CHF</string> 
    <string name="empty_description">..</string>
-        
    <string name="choose">Wählen</string>
-        <!-- General-->
+    <!-- General-->

-        <!-- uygulamının ilk açılan ekranı. pizzlink logosunun oldugu ekran -->
-        <!-- SplashActivity -->
-        
-    <string name="no_network_message">Keine Internetverbindung. Bitte versuchen Sie es später noch einmal.</string>
-        
-    <string name="alert_update_app">Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden.</string>
-        
+    <!-- SplashActivity -->  
+    <string name="no_network_message">Keine Internetverbindung. Bitte versuchen Sie es später noch einmal.</string>  
+    <string name="alert_update_app">Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden.</string>    
    <string name="update_app">AKTUALISIEREN</string>
-        <!-- SplashActivity -->
+    <!-- SplashActivity -->

-        <!-- giriş yap ekranı -->
-        <!-- LoginActivity-->
-        
+    <!-- LoginActivity-->
    <string name="activity_title_login">Einloggen</string>
-        
    <string name="button_login">EINLOGGEN</string>
-        
    <string name="not_have_an_accaount">Sie haben kein Konto?</string>
-        
-    <string name="register_text">REGISTRIEREN</string>
-        
-    <string name="forgot_password_hint">Haben Sie Ihr Passwort vergessen?</string>
-        
+    <string name="register_text">REGISTRIEREN</string>    
+    <string name="forgot_password_hint">Haben Sie Ihr Passwort vergessen?</string>  
    <string name="reset_password"><b><u>\nPASSWORT ZURÜCKSETZEN</u></b></string>
-        <!-- LoginActivity-->
+    <!-- LoginActivity-->

-        <!-- şifremi unuttum ekranı -->
-        <!-- ForgotPasswordActivity-->
-        
-    <string name="activity_title_forgot_password">Passwort vergessen</string>
-        
-    <string name="reset_password_hint"> Geben sie beim registrieren ihre E-Mail-Adresse ein und folgen Sie den Anweisungen.</string>
-        
-    <string name="reset_password_button">SENDEN</string>
-        
+    <!-- ForgotPasswordActivity-->
+    <string name="activity_title_forgot_password">Passwort vergessen</string>    
+    <string name="reset_password_hint"> Geben sie beim registrieren ihre E-Mail-Adresse ein und folgen Sie den Anweisungen.</string>    
+    <string name="reset_password_button">SENDEN</string>    
    <string name="password_reset">Erforderliche Informationen wurden an Ihre E-Mail-Adresse geschickt. Folgen Sie den Anweisungen um Ihr Passwort zurückzusetzen.</string>
-        <!-- ForgotPasswordActivity-->
+    <!-- ForgotPasswordActivity-->

-        <!-- kayıt ol ekranı -->
-        <!-- RegisterActivity-->
-        
-    <string name="activity_title_register">Registrieren</string>
-        
-    <string name="firstname">Vorname</string>
-        
-    <string name="lastname">Nachname</string>
-        
-    <string name="telephone">Telefonnummer</string>
-        
-    <string name="email">E-Mail-Adresse</string>
-        
-    <string name="password">Passwort</string>
-        
-    <string name="password_again">Passwort (erneut eingeben)</string>
-        
-    <string name="addres_line_1">Adresse</string>
-        
-    <string name="addres_line_2">Adresse 2</string>
-        
-    <string name="city">Stadt</string>
-        
-    <string name="postcode">Postleitzahl</string>
-        
-    <string name="zone">Gebiet</string>
-        
-    <string name="country">Land</string>
-        
-    <string name="alert_fill_all_fields">Bitte füllen Sie alle Felder aus.</string>
-        
-    <string name="alert_invalid_email">Bitte geben sie eine gültige E-Mail-Adresse ein.</string>
-        
-    <string name="alert_passwords_not_matched">Passwörter stimmen nicht überein.</string>
-        
-    <string name="alert_invalid_post_code">Bitte geben sie eine gültige Postleitzahl ein.</string>
-        
-    <string name="alert_select_country_first">Bitte wählen Sie zuerst ein Land.</string>
-        
+    <!-- RegisterActivity-->
+    <string name="activity_title_register">Registrieren</string>    
+    <string name="firstname">Vorname</string>    
+    <string name="lastname">Nachname</string>    
+    <string name="telephone">Telefonnummer</string>    
+    <string name="email">E-Mail-Adresse</string>    
+    <string name="password">Passwort</string>    
+    <string name="password_again">Passwort (erneut eingeben)</string>    
+    <string name="addres_line_1">Adresse</string>    
+    <string name="addres_line_2">Adresse 2</string>    
+    <string name="city">Stadt</string>    
+    <string name="postcode">Postleitzahl</string>    
+    <string name="zone">Gebiet</string>    
+    <string name="country">Land</string> 
+    <string name="alert_fill_all_fields">Bitte füllen Sie alle Felder aus.</string>    
+    <string name="alert_invalid_email">Bitte geben sie eine gültige E-Mail-Adresse ein.</string>  
+    <string name="alert_passwords_not_matched">Passwörter stimmen nicht überein.</string>    
+    <string name="alert_invalid_post_code">Bitte geben sie eine gültige Postleitzahl ein.</string>    
+    <string name="alert_select_country_first">Bitte wählen Sie zuerst ein Land.</string>    
    <string name="button_register">REGISTRIEREN</string>
-        <!-- RegisterActivity-->
+    <!-- RegisterActivity-->

-        <!-- ana ekrandaki alt menuler -->
-        <!-- MainAcitivity -->
-        
-    <string name="bottom_nav_menu_item_menu">Menu</string>
-        
-    <string name="bottom_nav_menu_item_cart">Cart</string>
-        
-    <string name="bottom_nav_menu_item_history">History</string>
-        
-    <string name="bottom_nav_menu_item_profile">Profile</string>
-        
+    <!-- MainAcitivity -->    
+    <string name="bottom_nav_menu_item_menu">Menu</string>    
+    <string name="bottom_nav_menu_item_cart">Cart</string>    
+    <string name="bottom_nav_menu_item_history">History</string>    
+    <string name="bottom_nav_menu_item_profile">Profile</string>    
    <string name="bottom_nav_menu_item_info">Info</string>
    <string name="cart_total">ZWISHENSUMME</string>
+    <!-- MainAcitivity -->

-
-        <!-- MainAcitivity -->
-
-     
-      <!-- ürün sayısı, bouyutu ve içeriklerinin seçilip sepete ekleme işleminin yapıldıgı ekran -->
-        <!-- ProductPropertiesBottomSheetDialog -->
-        
-    <string name="add_to_cart">IN DEN WARENKORB LEGEN</string>
-        
-    <string name="count">Count</string>
-        
+    <!-- ProductPropertiesBottomSheetDialog -->    
+    <string name="add_to_cart">IN DEN WARENKORB LEGEN</string>    
+    <string name="count">Count</string>    
    <string name="no_options_selected_part">is not selected.</string>
-        <!-- ProductPropertiesBottomSheetDialog -->
+    <!-- ProductPropertiesBottomSheetDialog -->

-        <!-- sepet ekranı -->
-        <!-- CartFragment-->
-        
-    <string name="continue_cart">WEITER</string>
-        
-    <string name="clear_cart">LÖSCHEN</string>
-        
-    <string name="no_product_on_cart">Es befindet sich kein Produkt im Warenkorb.</string>
-        
-    <string name="alert_remove_prdocut_from_cart">Möchten Sie das Produkt aus dem Warenkorb entfernen?</string>
-        
-    <string name="product_removed_from_cart">Produkt wurde aus dem Warenkorb entfernt.</string>
-        
+    <!-- CartFragment-->    
+    <string name="continue_cart">WEITER</string>    
+    <string name="clear_cart">LÖSCHEN</string>    
+    <string name="no_product_on_cart">Es befindet sich kein Produkt im Warenkorb.</string>    
+    <string name="alert_remove_prdocut_from_cart">Möchten Sie das Produkt aus dem Warenkorb entfernen?</string>    
+    <string name="product_removed_from_cart">Produkt wurde aus dem Warenkorb entfernt.</string>    
    <string name="alert_clear_cart">Möchten Sie alle Produkte aus dem Warenkorb entfernen?</string>
-        <!-- CartFragment-->
+    <!-- CartFragment-->

-        <!-- sipariş geçmişi ekranı -->
-        <!-- OrderHistoryFragment-->
-        
-    <string name="order_history_total">Total :</string>
-        
-    <string name="order_history_date">Date</string>
-        
+    <!-- OrderHistoryFragment-->
+    <string name="order_history_total">Total :</string>    
+    <string name="order_history_date">Date</string>    
    <string name="order_history_status">Status</string>
-        <!-- OrderHistoryFragment-->
+    <!-- OrderHistoryFragment-->

-        <!-- sipariş oluşturma ekranı -->
-        <!-- CreateOrderActivity -->
-        
-    <string name="activity_title_create_order">Bestellen</string>
-        
-    <string name="next">NEXT</string>
-        
-    <string name="previous">PREVIOUS</string>
-        
-    <string name="confirm_order">APPROVE</string>
-        
-    <string name="done_order">DONE</string>
-        
+    <!-- OrderHistoryDetailsActivity-->
+    <string name="activity_title_order_history_details">Order Details</string>    
+    <string name="order_history_order_date">CREATE DATE</string>    
+    <string name="order_history_order_status">STATUS</string>    
+    <string name="order_history_order_shipping_time">SHIPPING TIME</string>    
+    <string name="order_history_order_total">ZWISHENSUMME</string>    
+    <string name="order_history_order_payment_method">PAYMENT METHOD</string>    
+    <string name="order_history_order_fullname">FULLNAME</string>    
+    <string name="order_history_order_shipping_method">SHIPPING METHOD</string>    
+    <string name="order_history_order_shipping_address">SHIPPING ADDRESS</string>     
+    <string name="order_history_order_note">NACHRICHT</string> 
+    <!-- OrderHistoryDetailsActivity-->
+
+    <!-- CreateOrderActivity --> 
+    <string name="activity_title_create_order">Bestellen</string>    
+    <string name="next">NEXT</string>    
+    <string name="previous">PREVIOUS</string>    
+    <string name="confirm_order">APPROVE</string>    
+    <string name="done_order">DONE</string>    
    <string-array name="stepperLabels">
-                
        <item>Versandart</item>
-                
-        <item>Versandadresse</item>
-                
+        <item>Versandadresse</item>        
        <item>Bezahlverfahren</item>
-        <item>Nachricht</item>
-                
-        <item>Betrag</item>
-            
+        <item>Nachricht</item>        
+        <item>Betrag</item>    
    </string-array>
-        <!-- CreateOrderActivity -->
+    <!-- CreateOrderActivity -->

-        <!-- teslimat yöntemi seçme ekranı -->
-        <!-- ShippingMethodFragment-->
-        
+    <!-- ShippingMethodFragment-->    
    <string name="alert_choose_shipping_method">Lütfen bir teslimat yöntemi seçiniz.</string>
-        <!-- ShippingMethodFragment-->
+    <!-- ShippingMethodFragment-->
        
-        <!-- teslimat adresi seçme ekranı -->
-        <!-- ShippingAddressFragment-->
-        
+    <!-- ShippingAddressFragment-->
    <string name="alert_choose_shipping_address">Bitte wählen Sie eine Versandadresse aus oder fügen Sie eine neue Versandadresse hinzu.</string>
-        <!-- ShippingAddressFragment-->
+    <!-- ShippingAddressFragment-->

-        <!-- ödeme yöntemi seçme ekranı -->
-        <!-- PaymentMethodFragment-->
-        
+    <!-- PaymentMethodFragment-->
    <string name="alert_choose_payment_method">Bitte wählen Sie ein Bezahlverfahren aus.</string>
-        <!-- PaymentMethodFragment-->
+    <!-- PaymentMethodFragment-->

-    <!-- sipariş notu ekranı -->
    <!-- CreateOrderNoteFragment-->
    <string name="order_note">Nachricht (Optional)</string>
    <!-- CreateOrderNoteFragment-->

-        <!-- sipariş özet ekranı -->
-        <!-- CreateOrderSummaryFragment-->
-        
-    <string name="order_person_fullname">TO</string>
-        
-    <string name="order_shipping_method">SHIPPING METHOD</string>
-        
-    <string name="order_shipping_address">SHIPPING ADDRESS</string>
-        
-    <string name="order_payment_method">PAYMENT METHOD</string>
-        
+    <!-- CreateOrderSummaryFragment-->    
+    <string name="order_person_fullname">TO</string>    
+    <string name="order_shipping_method">SHIPPING METHOD</string>    
+    <string name="order_shipping_address">SHIPPING ADDRESS</string>    
+    <string name="order_payment_method">PAYMENT METHOD</string>    
    <string name="order_total">TOTAL</string>
    <string name="order_notee">NACHRICHT</string>
-        <!-- CreateOrderSummaryFragment-->
+    <!-- CreateOrderSummaryFragment-->

-        <!-- sipariş sınucu ekranı -->
-        <!-- CreateOrderResultFragment-->
-        
+    <!-- CreateOrderResultFragment-->
    <string name="order_successed">Ihre Bestellung ist erfolgreich. Ihre Bestellübersicht werden in der Bestellungshistorie angezeigt und kann dort verfolgt werden.</string>
-        <!-- CreateOrderSummaryFragment-->
+    <!-- CreateOrderSummaryFragment-->

-        <!-- profil ekranı -->
-        <!-- ProfileFragment-->
-        
-    <string name="profile_firstname">VORNAME</string>
-        
-    <string name="profile_lastname">NACHNAME</string>
-        
-    <string name="profile_telephone">TELEFONNUMMER</string>
-        
-    <string name="profile_email">E-MAIL-ADRESSE</string>
-        
-    <string name="my_addresses">Meine Adressen</string>
-        
-    <string name="update_profile">Profil aktualisieren</string>
-        
-    <string name="update_password">Passwort aktualisieren</string>
-        
-    <string name="button_logout">Abmelden</string>
-        
+    <!-- ProfileFragment-->    
+    <string name="profile_firstname">VORNAME</string>    
+    <string name="profile_lastname">NACHNAME</string>    
+    <string name="profile_telephone">TELEFONNUMMER</string>    
+    <string name="profile_email">E-MAIL-ADRESSE</string>    
+    <string name="my_addresses">Meine Adressen</string>    
+    <string name="update_profile">Profil aktualisieren</string>    
+    <string name="update_password">Passwort aktualisieren</string>    
+    <string name="button_logout">Abmelden</string>    
    <string name="alert_logout">Möchten Sie sich abmelden?</string>
-        <!-- ProfileFragment-->
+    <!-- ProfileFragment-->

-        <!-- profil bilgilerini güncelleme ekranı -->
-        <!-- UpdateProfilectivity-->
-        
+    <!-- UpdateProfilectivity-->
    <string name="activity_title_update_profile">Profil Aktualisieren</string>
-        
    <string name="profile_updated">Ihr Profil wurde erfolgreich aktualisiert..</string>
-        <!-- UpdateProfilectivity-->
+    <!-- UpdateProfilectivity-->

-        <!-- şifre güncelleme ekranı -->
-        <!-- UpdatePasswordActivity-->
-        
-    <string name="activity_title_update_password">Passwort Aktualisieren</string>
-        
-    <string name="hint_old_password">Altes Passwort</string>
-        
-    <string name="hint_new_password">Neues Passwort</string>
-        
-    <string name="hint_confirm_new_password">Neues Passwort (erneut eingeben)</string>
-        
+    <!-- UpdatePasswordActivity-->    
+    <string name="activity_title_update_password">Passwort Aktualisieren</string>    
+    <string name="hint_old_password">Altes Passwort</string>    
+    <string name="hint_new_password">Neues Passwort</string>    
+    <string name="hint_confirm_new_password">Neues Passwort (erneut eingeben)</string>    
    <string name="password_updated">Ihr Passwort wurde erfolgreich aktualisiert.</string>
-        <!-- UpdatePasswordActivity-->
+    <!-- UpdatePasswordActivity-->

-        <!-- adreslerini görüntüleme ekranı -->
-        <!-- MyAddressesActivity-->
-        
-    <string name="activity_title_my_addresses">Meine Adressen</string>
-        
-    <string name="add_new_address">NEUE ADRESSE HINZUFÜGEN</string>
-        
-    <string name="alert_delete_address">Möchten Sie diese Adresse löschen?</string>
-        
+    <!-- MyAddressesActivity-->    
+    <string name="activity_title_my_addresses">Meine Adressen</string>    
+    <string name="add_new_address">NEUE ADRESSE HINZUFÜGEN</string>    
+    <string name="alert_delete_address">Möchten Sie diese Adresse löschen?</string>    
    <string name="address_deleted">Ihre Adresse wurde erfolgreich gelöscht.</string>
-        <!-- MyAddressesActivity-->
+    <!-- MyAddressesActivity-->

-        <!-- yeni adres ekleme ekranı -->
-        <!-- AddAddressActivity-->
-        
-    <string name="activity_title_add_address">Neue Adresse hinzufügen</string>
-        
-    <string name="add">HINZUFÜGEN</string>
-        
+    <!-- AddAddressActivity-->
+    <string name="activity_title_add_address">Neue Adresse hinzufügen</string> 
+    <string name="add">HINZUFÜGEN</string>    
    <string name="new_address_added">Adresse wurde erfolgreich hinzugefügt.</string>
-        <!-- AddAddressActivity-->
-
+    <!-- AddAddressActivity-->

 </resources>

--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 11 21:04:33 EEST 2017
+#Wed Nov 22 20:22:25 EET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip