diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9a3a5f4..d831720 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index e606072..4fc7d43 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
index 1301ffe..b8e9f4b 100644
--- a/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
+++ b/app/src/main/java/ch/pizzaleu/android/fragment/createOrder/CreateOrderSummaryFragment.java
@@ -125,6 +125,12 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         return view;
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        createBraintreePaymentToken();
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -836,6 +842,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
+                DialogHelper.hideLoadingDialog();
                 if(response.isSuccessful() &&
                         response.body().getData() != null &&
                         response.body().isSuccess()){
@@ -847,10 +854,8 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                     cartTotalList.addAll(cartInfoModel.getTotalsList());
                     fixCartTotalList();
                     orderPriceRecyclerAdapter.notifyDataSetChanged();
-                    createBraintreePaymentToken();
                 }
                 else {
-                    DialogHelper.hideLoadingDialog();
                     ApiErrorUtils.parseError(response);
                 }
             }
@@ -871,7 +876,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         call.enqueue(new Callback<ResponseObject<PaymentTokenModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<PaymentTokenModel>> call, Response<ResponseObject<PaymentTokenModel>> response) {
-                DialogHelper.hideLoadingDialog();
                 if(response.isSuccessful() &&
                         response.body().getData() != null &&
                         response.body().isSuccess()){
@@ -885,7 +889,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
 
             @Override
             public void onFailure(Call<ResponseObject<PaymentTokenModel>> call, Throwable t) {
-                DialogHelper.hideLoadingDialog();
                 DialogHelper.showFailedDialog();
             }
         });