First commit - feature 900 Cliente cancelar pedido #251

joel-eche · 2017-02-10T05:40:55Z

No description provided.

macool · 2017-02-10T11:35:32Z

app/scripts/controllers/customer/orders/customer-order-controller.js

@@ -62,5 +64,22 @@
      }, 0);
    }

+    function cancelOrder(){
+      var submitted=new Date(customerOrderVm.customerOrder.submitted_at); // jshint ignore:line
+      var now=new Date();


nope. utilizamos moment

macool · 2017-02-10T11:36:30Z

app/templates/customer/orders/show.jade

+    .list.list--centered.text-center
+      button.button.button-outline.button-assertive(
+        ng-click="customerOrderVm.cancelOrder()"
+      ) {{::("globals.cancel"|translate)}} {{::("order.order"|translate)}}


un sólo locale; puede ser cancelCustomerOrder

Realizado, un solo mensaje, sin concatenar

macool · 2017-02-10T11:36:56Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+      if((now-submitted)/60000>5){
+        $ionicPopup.alert({
+          title: 'Error',
+          template: '{{::("order.cancel.error"|translate)}}'


en el error debes mostrar los errores del api

Cambiado por un mensaje "error", en mensaje será cambiado luego depende lo que me devuelva el api

macool · 2017-02-10T11:37:03Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+      else {
+        $ionicPopup.alert({
+          title: 'Éxito',
+          template: '{{::("order.cancel.success"|translate)}}'


y en success haces POST al api

POST realizado en service, la ruta puede ser cambiada, de acuerdo a lo que se proporcione en el api

macool · 2017-02-12T18:39:32Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+              });
+            });
+      }
+      else {


el botón no debe mostrarse después de los 5 minutos - tal vez podemos dejar esto para luego, primero integremos con el API

macool · 2017-02-12T18:40:05Z

app/scripts/services/customer-orders-service.js

+          .then(function success(response){
+            return response.data;
+          },function error(response){
+            return $q.reject(response.errors);


copia los demás, no hay que hacer esto

macool · 2017-02-13T00:08:06Z

@joel-eche una cosa más, me acabo de dar cuenta que vamos a tener que cancelar cada entrega dentro de un pedido

macool · 2017-02-13T01:44:20Z

@joel-eche en noggalito/porttare-backend@8ebb455 y noggalito/porttare-backend@c24cfd6 está el API

joel-eche · 2017-02-14T04:37:50Z

@macool ... He estado revisando, esta es la parte del api?
/customer/orders/:order_id/deliveries/:id/cancel

macool · 2017-02-16T03:27:29Z

app/scripts/services/customer-orders-service.js

@@ -33,5 +34,17 @@
      );
    }

+    function cancelCustomerOrder(customerOrderId){
+      return $http({


hay un CommonService o algo así que creo que hace esto exactamente

macool · 2017-02-16T22:59:27Z

app/templates/customer/orders/show.jade

+    span
+      //- some spacing
+
+    .list.list--centered.text-center


un botón por cada pedido

macool · 2017-02-16T22:59:47Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+      $ionicLoading.show({
+        template: '{{::("globals.updating"|translate)}}'
+      });
+      angular.forEach(customerOrderProviderProfiles,function(provider){


se cancela cada proveedor por separado

macool · 2017-02-16T23:00:34Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+      var customerOrderProviderProfiles=customerOrderVm.customerOrder.provider_profiles; // jshint ignore:line
+      var cont=0;
+      $ionicLoading.show({
+        template: '{{::("globals.updating"|translate)}}'


algo como cancelando

macool · 2017-02-16T23:00:40Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+    function cancelOrder(){
+      var customerOrderId=customerOrderVm.customerOrder.id;
+      var customerOrderProviderProfiles=customerOrderVm.customerOrder.provider_profiles; // jshint ignore:line
+      var cont=0;


macool · 2017-02-16T23:01:15Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+          cont++;
+          if (cont === customerOrderProviderProfiles.length){
+            $ionicLoading.hide();
+            $ionicPopup.alert({


sin popups, deberíamos escribir algo en el documento en lugar de eso

joel-eche · 2017-02-19T05:40:24Z

@macool, últimos comentarios revisados

macool · 2017-02-19T13:27:29Z

app/scripts/services/customer-orders-service.js

@@ -5,10 +5,11 @@
    .module('porttare.services')
    .factory('CustomerOrdersService', CustomerOrdersService);

-  function CustomerOrdersService($http, ENV, ErrorHandlerService) {
+  function CustomerOrdersService($http, ENV, $q, ErrorHandlerService) {


macool · 2017-02-19T13:27:52Z

app/templates/customer/orders/show.jade

@@ -92,6 +92,11 @@ ion-view(
            price(amount="{{ ::providerProfile.totalCentsOrderProvider }}"
                  currency="{{customerOrderVm.customerOrder.subtotal_items_currency}}")

+      .list.list--centered.text-center(ng-if="providerProfile.customer_order_delivery.status !== 'canceled'")
+        button.button.button-outline.button-assertive(
+        ng-click="customerOrderVm.cancelOrder({{ ::providerProfile.customer_order_delivery.id}},$index)"


no creo que sea $index, puedes hacerlo bien?

ah, pasas el índice para luego reemplazar en el arreglo? puedes hacer un find luego y no pasamos índices

macool · 2017-02-19T13:29:49Z

app/scripts/services/customer-orders-service.js

@@ -33,5 +34,17 @@
      );
    }

+    function cancelCustomerOrder(customerOrderId,CustomerOrderDeliveryId){


podría ser cancelDelivery o cancelCustomerOrderDelivery

joel-eche · 2017-02-19T19:16:47Z

@macool ... "$q" eliminado, uso de búsqueda para el índice y cambio de nombre al servicio "cancelCustomerOrder" por "cancelCustomerOrderDelivery"

macool · 2017-02-21T05:57:25Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+        template: '{{::("order.canceling"|translate)}}'
+      });
+      CustomerOrdersService.cancelCustomerOrderDelivery(customerOrderVm.customerOrder.id,providerCustomerOrderDeliveryId).then(function (resp){
+        var index=customerOrderVm.customerOrder.provider_profiles.findIndex(function(element){ // jshint ignore:line


necesitaremos polyfill para findIndex?

macool · 2017-02-21T05:58:46Z

app/templates/customer/orders/show.jade

@@ -92,6 +92,11 @@ ion-view(
            price(amount="{{ ::providerProfile.totalCentsOrderProvider }}"
                  currency="{{customerOrderVm.customerOrder.subtotal_items_currency}}")

+      .list.list--centered.text-center(ng-if="providerProfile.customer_order_delivery.status !== 'canceled'")
+        button.button.button-outline.button-assertive(
+        ng-click="customerOrderVm.cancelOrder({{ ::providerProfile.customer_order_delivery.id}})"


necesitamos ell {{}} dentro de ng-click?

macool · 2017-02-21T05:59:37Z

app/scripts/controllers/customer/orders/customer-order-controller.js

+                  });
+        customerOrderVm.customerOrder.provider_profiles[index]=resp; // jshint ignore:line
+      }).finally(function () {
+        $ionicLoading.hide();


nos falta mostrar los errores del api en caso de haber

mejor escribirlos en el documento en lugar de hacer popup

El popup del error sale automáticamente, siempre arroja un 401

macool reviewed Feb 10, 2017

View reviewed changes

macool reviewed Feb 12, 2017

View reviewed changes

macool reviewed Feb 16, 2017

View reviewed changes

joel-eche force-pushed the feature900-cliente-cancelarpedido branch from 230e06c to c595c65 Compare February 16, 2017 16:27

macool reviewed Feb 16, 2017

View reviewed changes

app/templates/customer/orders/show.jade Outdated

span

//- some spacing

.list.list--centered.text-center

Copy link

Member

macool Feb 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

un botón por cada pedido

macool reviewed Feb 16, 2017

View reviewed changes

joel-eche force-pushed the feature900-cliente-cancelarpedido branch from c595c65 to 9cc4a71 Compare February 19, 2017 05:34

macool reviewed Feb 19, 2017

View reviewed changes

joel-eche added 5 commits February 19, 2017 14:12

First commit - feature 900 Cliente cancelar pedido

d4ead9f

Primera revision, feature 900 Cliente cancelar pedido

ac2e582

Segunda revisión , feature 900

efc69a2

Tercera revisión, feature 900 Cliente cancelar pedido

24018ff

Cuarta revisión, feature 900 Cliente cancelar pedido

9d23cec

joel-eche force-pushed the feature900-cliente-cancelarpedido branch from 9cc4a71 to 9d23cec Compare February 19, 2017 19:12

macool reviewed Feb 21, 2017

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

First commit - feature 900 Cliente cancelar pedido #251

First commit - feature 900 Cliente cancelar pedido #251

joel-eche commented Feb 10, 2017

macool Feb 10, 2017

macool Feb 10, 2017

joel-eche Feb 11, 2017

macool Feb 10, 2017

joel-eche Feb 11, 2017

macool Feb 10, 2017

joel-eche Feb 11, 2017 •

edited

Loading

macool Feb 10, 2017

joel-eche Feb 11, 2017

macool Feb 12, 2017

macool Feb 12, 2017

macool commented Feb 13, 2017

macool commented Feb 13, 2017

joel-eche commented Feb 14, 2017

macool Feb 16, 2017

macool Feb 16, 2017

macool Feb 16, 2017

macool Feb 16, 2017

macool Feb 16, 2017

macool Feb 16, 2017

joel-eche commented Feb 19, 2017

macool Feb 19, 2017

macool Feb 19, 2017

macool Feb 19, 2017

macool Feb 19, 2017

joel-eche commented Feb 19, 2017

macool Feb 21, 2017

macool Feb 21, 2017

macool Feb 21, 2017

macool Feb 21, 2017

joel-eche Feb 23, 2017

First commit - feature 900 Cliente cancelar pedido #251

Are you sure you want to change the base?

First commit - feature 900 Cliente cancelar pedido #251

Conversation

joel-eche commented Feb 10, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joel-eche Feb 11, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

macool commented Feb 13, 2017

macool commented Feb 13, 2017

joel-eche commented Feb 14, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joel-eche commented Feb 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joel-eche commented Feb 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joel-eche Feb 11, 2017 •

edited

Loading