From 166b6d3fa8c7d16705b04ef54ce35706913fa7f2 Mon Sep 17 00:00:00 2001 From: Daniel Camargo Date: Tue, 13 Aug 2013 14:19:28 -0300 Subject: [PATCH] partial #1381 --- .../crunchbutton/api/restaurant/index.php | 3 ++ include/library/Crunchbutton/Restaurant.php | 1 + .../default/cockpit/restaurants/pay.phtml | 30 ++++++++++++++----- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/include/controllers/default/crunchbutton/api/restaurant/index.php b/include/controllers/default/crunchbutton/api/restaurant/index.php index 18a7dd580..1cc7348de 100644 --- a/include/controllers/default/crunchbutton/api/restaurant/index.php +++ b/include/controllers/default/crunchbutton/api/restaurant/index.php @@ -148,6 +148,7 @@ class Controller_api_restaurant extends Crunchbutton_Controller_Rest { if ($r->id_restaurant) { $r->balanced_id = c::config()->balanced->sharedMerchant; $r->save(); + echo json_encode( [ 'success' => 'success' ] ); } break; @@ -155,6 +156,7 @@ class Controller_api_restaurant extends Crunchbutton_Controller_Rest { if ($r->id_restaurant) { $r->balanced_id = null; $r->save(); + echo json_encode( [ 'success' => 'success' ] ); } break; @@ -162,6 +164,7 @@ class Controller_api_restaurant extends Crunchbutton_Controller_Rest { if ($r->id_restaurant) { $r->balanced_bank = null; $r->save(); + echo json_encode( [ 'success' => 'success' ] ); } break; diff --git a/include/library/Crunchbutton/Restaurant.php b/include/library/Crunchbutton/Restaurant.php index 9d2c47068..58b191d49 100644 --- a/include/library/Crunchbutton/Restaurant.php +++ b/include/library/Crunchbutton/Restaurant.php @@ -271,6 +271,7 @@ class Crunchbutton_Restaurant extends Cana_Table_Trackchange { $info = $this->merchant()->addBankAccount($bank); $this->balanced_bank = $bank->id; $this->save(); + echo json_encode( [ 'success' => 'success' ] ); } catch (Exception $e) { print_r($e); exit; diff --git a/include/views/default/cockpit/restaurants/pay.phtml b/include/views/default/cockpit/restaurants/pay.phtml index 3e91daf27..7a03f4597 100644 --- a/include/views/default/cockpit/restaurants/pay.phtml +++ b/include/views/default/cockpit/restaurants/pay.phtml @@ -52,6 +52,7 @@
+     @@ -369,13 +370,28 @@ $('.restaurant-bank-info-button').click(function() { var form = $(this).closest('form'); - $.post('/api/restaurant/restaurant->id_restaurant?>/bankinfo', { - routing: form.find('[name="routing"]').val(), - account: form.find('[name="account"]').val(), - type: form.find('[name="type"]').val(), - name: form.find('[name="name"]').val() - }, function() { - location.href = location.href; + $( '.restaurant-bank-info-button-loading' ).show(); + $.ajax({ + type: 'POST', + url: '/api/restaurant/restaurant->id_restaurant?>/bankinfo', + data: { + routing: form.find('[name="routing"]').val(), + account: form.find('[name="account"]').val(), + type: form.find('[name="type"]').val(), + name: form.find('[name="name"]').val() + } + }).done(function( data ) { + if( data.success ){ + location.href = location.href; + } else { + $( '.restaurant-bank-info-button-loading' ).hide(); + alert( 'Error: see the console!' ); + console.log('Err:', data ); + } + }).fail(function(jqXHR, textStatus) { + $( '.restaurant-bank-info-button-loading' ).hide(); + alert( 'Error: see the console!' ); + console.log('Err:', jqXHR.responseText); }); });