From 53b454c0f03b2a82f0fe77ea748d614dc7f9d7f9 Mon Sep 17 00:00:00 2001
From: Trung Nguyen <nguyenht65.se@gmail.com>
Date: Mon, 7 Mar 2022 11:58:02 +0700
Subject: [PATCH] edit model order

---
 .../fu/prm391/sampl/project/model/order/Order.java | 14 +++++++++++++-
 .../res/layout/item_my_orders_history_product.xml  |  2 +-
 build.gradle                                       |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fu/prm391/sampl/project/model/order/Order.java b/app/src/main/java/fu/prm391/sampl/project/model/order/Order.java
index 0605cbd..062cac9 100644
--- a/app/src/main/java/fu/prm391/sampl/project/model/order/Order.java
+++ b/app/src/main/java/fu/prm391/sampl/project/model/order/Order.java
@@ -14,6 +14,9 @@ public class Order {
     @SerializedName("address")
     @Expose
     private Address address;
+    @SerializedName("status")
+    @Expose
+    private int status;
     @SerializedName("quantity")
     @Expose
     private int quantity;
@@ -27,9 +30,10 @@ public class Order {
     public Order() {
     }
 
-    public Order(Product product, Address address, int quantity, String createdAt, String updatedAt) {
+    public Order(Product product, Address address, int status, int quantity, String createdAt, String updatedAt) {
         this.product = product;
         this.address = address;
+        this.status = status;
         this.quantity = quantity;
         this.createdAt = createdAt;
         this.updatedAt = updatedAt;
@@ -51,6 +55,14 @@ public void setAddress(Address address) {
         this.address = address;
     }
 
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
     public int getQuantity() {
         return quantity;
     }
diff --git a/app/src/main/res/layout/item_my_orders_history_product.xml b/app/src/main/res/layout/item_my_orders_history_product.xml
index a9e0ba0..c216b8e 100644
--- a/app/src/main/res/layout/item_my_orders_history_product.xml
+++ b/app/src/main/res/layout/item_my_orders_history_product.xml
@@ -38,7 +38,7 @@
 
             <androidx.cardview.widget.CardView
                 android:id="@+id/cardView9"
-                android:layout_width="110dp"
+                android:layout_width="95dp"
                 android:layout_height="100dp"
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="30dp"
diff --git a/build.gradle b/build.gradle
index 13de72a..26458be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files