Skip to content

Commit eb57f40

Browse files
committed
Projeto: CRUD Contas a Pagar e Receber
1 parent 5725bd9 commit eb57f40

File tree

7 files changed

+51
-35
lines changed

7 files changed

+51
-35
lines changed

app/Http/Controllers/Api/BillReceivesController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public function index(Request $request)
4141
->pushCriteria(new FindBetweenDateBRCriteria($search, 'date_due'))
4242
->pushCriteria(new FindByValueBRCriteria($search));
4343

44-
$billPays = $this->repository->paginate();
44+
$bills = $this->repository->paginate();
4545

46-
return $billPays;
46+
return $bills;
4747
}
4848

4949
/**

app/Transformers/BillTransformer.php

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ public function transform(AbstractBill $model)
3939

4040
public function includeCategory(AbstractBill $model)
4141
{
42+
if(!$model->category){
43+
return null;
44+
}
45+
4246
$transformer = new CategoryTransformer();
4347
$transformer->setDefaultIncludes([]);
4448
return $this->item($model->category, $transformer);

public/build/spa.bundle.js

+11-7
Large diffs are not rendered by default.

resources/assets/spa/js/components/Menu.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@
6969
},
7070
computed: {
7171
name(){
72-
return store.state.auth.user.name;
72+
let username = '';
73+
if(store.state.auth.user){
74+
username = store.state.auth.user.name;
75+
}
76+
return username;
7377
}
7478
},
7579
ready(){

resources/assets/spa/js/components/bill/_form.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div>
2-
<form id="formId()" name="form" method="POST" @submit.prevent="submit">
2+
<form :id="formId()" name="form" method="POST" @submit.prevent="submit">
33
<modal :modal="modalOptions">
44
<div slot="content">
55
<h5>{{title()}}</h5>
66
<div class="row">
77
<div class="input-field col s12">
88
<select-material :options="parentOptions" :selected.sync="bill.category_id"
99
v-validate data-vv-rules="required" data-vv-name="category_id"
10-
data-vv-value-path="val" name="category_id">
10+
data-vv-value-path="val" data-vv-as="categoria" name="category_id">
1111
</select-material>
1212
<label class="active" :data-error="errors.first('category_id')">Categoria de Despesa</label>
1313
</div>

resources/assets/spa/js/components/bill/bill-receive/BillReceiveList.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
<bill-receive-update :index="indexUpdate" :modal-options="modalEdit"></bill-receive-update>
5252

5353
<modal :modal="modalDelete">
54-
<div slot="content" v-if="billPayDelete">
54+
<div slot="content" v-if="billReceiveDelete">
5555
<h4>Mensagem de confirmação</h4>
5656
<p><strong>Deseja excluir esta conta?</strong></p>
5757
<div class="divider"></div>
58-
<p>Vencimento: <strong>{{billPayDelete.date_due}}</strong></p>
59-
<p>Nome: <strong>{{billPayDelete.name}}</strong></p>
60-
<p>Valor: <strong>{{billPayDelete.value}}</strong></p>
58+
<p>Vencimento: <strong>{{billReceiveDelete.date_due}}</strong></p>
59+
<p>Nome: <strong>{{billReceiveDelete.name}}</strong></p>
60+
<p>Valor: <strong>{{billReceiveDelete.value}}</strong></p>
6161
<div class="divider"></div>
6262
</div>
6363
<div slot="footer">
@@ -114,10 +114,10 @@
114114
},
115115
computed: {
116116
bills(){
117-
return store.state.billPay.bills;
117+
return store.state.billReceive.bills;
118118
},
119119
searchOptions(){
120-
return store.state.billPay.searchOptions;
120+
return store.state.billReceive.searchOptions;
121121
},
122122
search: {
123123
get(){

routes/api.php

+21-17
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,30 @@
1313
|
1414
*/
1515

16-
Route::group(['middleware' => 'cors','as'=>'api.'],function(){
17-
Route::resource('banks', 'Api\BanksController',['only'=>['index']]);
18-
Route::get('bank_accounts/lists', 'Api\BankAccountsController@lists')->name('bank_accounts.lists');
19-
Route::resource('bank_accounts', 'Api\BankAccountsController',['except'=>['create','edit']]);
20-
Route::resource('category_revenues', 'Api\CategoryRevenuesController',['except'=>['create','edit']]);
21-
Route::resource('category_expenses', 'Api\CategoryExpensesController',['except'=>['create','edit']]);
22-
Route::resource('bill_pays', 'Api\BillPaysController',['except'=>['create','edit']]);
23-
Route::resource('bill_receives', 'Api\BillReceivesController',['except'=>['create','edit']]);
24-
Route::get('statements', 'Api\StatementsController@index');
25-
Route::get('cash_flows', 'Api\CashFlowsController@index');
26-
27-
Route::post('access_token','Api\AuthController@accessToken')->name('access_token');
28-
Route::post('refresh_token','Api\AuthController@refreshToken')->name('refresh_token');
29-
30-
Route::group(['middleware'=>'auth:api'],function(){
31-
Route::post('logout','Api\AuthController@logout')->name('logout');
32-
Route::get('user',function(){
16+
Route::group(['middleware' => 'cors', 'as' => 'api.'], function () {
17+
18+
Route::post('access_token', 'Api\AuthController@accessToken')->name('access_token');
19+
Route::post('refresh_token', 'Api\AuthController@refreshToken')->name('refresh_token');
20+
21+
Route::group(['middleware' => 'auth:api'], function () {
22+
23+
Route::post('logout', 'Api\AuthController@logout')->name('logout');
24+
25+
Route::get('user', function () {
3326
$user = Auth::guard('api')->user();
3427
return $user;
3528
})->name('user');
29+
30+
Route::resource('banks', 'Api\BanksController', ['only' => ['index']]);
31+
Route::get('bank_accounts/lists', 'Api\BankAccountsController@lists')->name('bank_accounts.lists');
32+
Route::resource('bank_accounts', 'Api\BankAccountsController', ['except' => ['create', 'edit']]);
33+
Route::resource('category_revenues', 'Api\CategoryRevenuesController', ['except' => ['create', 'edit']]);
34+
Route::resource('category_expenses', 'Api\CategoryExpensesController', ['except' => ['create', 'edit']]);
35+
Route::resource('bill_pays', 'Api\BillPaysController', ['except' => ['create', 'edit']]);
36+
Route::resource('bill_receives', 'Api\BillReceivesController', ['except' => ['create', 'edit']]);
37+
Route::get('statements', 'Api\StatementsController@index');
38+
Route::get('cash_flows', 'Api\CashFlowsController@index');
39+
3640
});
3741

3842
});

0 commit comments

Comments
 (0)