Просмотр исходного кода

Merge branch 'master' into update

Rahmat Ade Saputra 3 лет назад
Родитель
Сommit
a9f46ca18e

+ 2
- 4
app/Http/Controllers/TransactionController.php Просмотреть файл

@@ -154,11 +154,11 @@ class TransactionController extends Controller
154 154
             // $thermalPrinting = new ThermalPrinting($transaction);
155 155
             // $thermalPrinting->startPrinting(2);
156 156
             try {
157
-                $socket->connect();
158 157
                 $socket = new WebsocketClient(
159 158
                     new SocketClient('ws://43.230.131.149:5544')
160 159
                 );
161 160
                 $socket->setHost('escpos-server');
161
+                $socket->connect();
162 162
                 $socket->send(json_encode($transaction));
163 163
                 $socket->close();
164 164
                 // dd($socket->getConnection()->getCurrentNode());
@@ -166,10 +166,8 @@ class TransactionController extends Controller
166 166
                 return back()->with('error', __('messages.error.store.transaction'));
167 167
             }
168 168
 
169
-            $customer = Customer::find('customer_number', $request->customer_number);
170
-
171 169
             Http::post('https://gerbangchatapi.dijitalcode.com/chat/send?id=bambslaundry', [
172
-                'receiver' => $customer->phone,
170
+                'receiver' => $transaction->customer->phone,
173 171
                 'message' => 'Terima kasih sudah mempercayakan layanan laundry kepada Bamb\'s Laundry. Nomor transaksi Anda adalah *' . $request->transaction_number . '*',
174 172
             ]);
175 173
 

+ 2
- 2
public/js/resources_js_pages_auth_Login_vue.js Просмотреть файл

@@ -136,8 +136,8 @@ __webpack_require__.r(__webpack_exports__);
136 136
     var expose = _ref.expose;
137 137
     expose();
138 138
     var form = (0,_inertiajs_inertia_vue3__WEBPACK_IMPORTED_MODULE_0__.useForm)({
139
-      email: 'admin@laundry.com',
140
-      password: 'admin',
139
+      email: '',
140
+      password: '',
141 141
       remember: false
142 142
     });
143 143
 

+ 1
- 1
public/js/vue.js Просмотреть файл

@@ -57321,7 +57321,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
57321 57321
 /******/ 		// This function allow to reference async chunks
57322 57322
 /******/ 		__webpack_require__.u = (chunkId) => {
57323 57323
 /******/ 			// return url for filenames based on template
57324
-/******/ 			return "js/" + chunkId + ".js?id=" + {"resources_js_pages_Access_vue":"468858d5e6036395","resources_js_pages_auth_ForgotPassword_vue":"3554854765c279e7","resources_js_pages_auth_Login_vue":"9a1d539fb847ae14","resources_js_pages_auth_ResetPassword_vue":"e25203b18c22c6f4","resources_js_pages_auth_VerifyEmail_vue":"935e9a061613a89a","resources_js_pages_customer_Create_vue":"b87fea92d2ea3f38","resources_js_pages_customer_Edit_vue":"9b6385ec686a130c","resources_js_pages_customer_Index_vue":"759ecbef557d0ca6","resources_js_pages_customer_TableHeader_js":"5a71001a3c75e000","resources_js_pages_expense_Create_vue":"316d362973fcfd46","resources_js_pages_expense_Index_vue":"fff0fddfd04e0553","resources_js_pages_expense_TableHeader_js":"01ba1a5fb8eecd28","resources_js_pages_laundry_Create_vue":"9bd30a7855eb82ce","resources_js_pages_laundry_Edit_vue":"af0f04399421862e","resources_js_pages_laundry_Index_vue":"725d0531335b98b6","resources_js_pages_laundry_TableHeader_js":"494e577855bbcaf6","resources_js_pages_mutation_Index_vue":"27c02706e2528410","resources_js_pages_mutation_TableHeader_js":"831017a8dedc0b22","resources_js_pages_outlet_Create_vue":"b55b85da6ac33599","resources_js_pages_outlet_Edit_vue":"b86b2f5e9f3669f4","resources_js_pages_outlet_Index_vue":"c99d36d1b4c06832","resources_js_pages_outlet_TableHeader_js":"498bf7e64bc0d0c4","resources_js_pages_transaction_Create_vue":"c1fcedc5ee096d97","resources_js_pages_transaction_Index_vue":"c434646125c698a7","resources_js_pages_transaction_Show_vue":"4f39bbfe26e2b3fb","resources_js_pages_transaction_TableHeader_js":"8b928867ad174e10","resources_js_pages_user_Create_vue":"df31a0fb07fa8152","resources_js_pages_user_Edit_vue":"33996638b9d5702f","resources_js_pages_user_Index_vue":"a6a3db3c64a384c8","resources_js_pages_user_Show_vue":"d9bfdbe52508c33f","resources_js_pages_user_TableHeader_js":"5653ecbcd70fd235"}[chunkId] + "";
57324
+/******/ 			return "js/" + chunkId + ".js?id=" + {"resources_js_pages_Access_vue":"468858d5e6036395","resources_js_pages_auth_ForgotPassword_vue":"3554854765c279e7","resources_js_pages_auth_Login_vue":"06cfaa856f06c83a","resources_js_pages_auth_ResetPassword_vue":"e25203b18c22c6f4","resources_js_pages_auth_VerifyEmail_vue":"935e9a061613a89a","resources_js_pages_customer_Create_vue":"b87fea92d2ea3f38","resources_js_pages_customer_Edit_vue":"9b6385ec686a130c","resources_js_pages_customer_Index_vue":"759ecbef557d0ca6","resources_js_pages_customer_TableHeader_js":"5a71001a3c75e000","resources_js_pages_expense_Create_vue":"316d362973fcfd46","resources_js_pages_expense_Index_vue":"fff0fddfd04e0553","resources_js_pages_expense_TableHeader_js":"01ba1a5fb8eecd28","resources_js_pages_laundry_Create_vue":"9bd30a7855eb82ce","resources_js_pages_laundry_Edit_vue":"af0f04399421862e","resources_js_pages_laundry_Index_vue":"725d0531335b98b6","resources_js_pages_laundry_TableHeader_js":"494e577855bbcaf6","resources_js_pages_mutation_Index_vue":"27c02706e2528410","resources_js_pages_mutation_TableHeader_js":"831017a8dedc0b22","resources_js_pages_outlet_Create_vue":"b55b85da6ac33599","resources_js_pages_outlet_Edit_vue":"b86b2f5e9f3669f4","resources_js_pages_outlet_Index_vue":"c99d36d1b4c06832","resources_js_pages_outlet_TableHeader_js":"498bf7e64bc0d0c4","resources_js_pages_transaction_Create_vue":"c1fcedc5ee096d97","resources_js_pages_transaction_Index_vue":"c434646125c698a7","resources_js_pages_transaction_Show_vue":"4f39bbfe26e2b3fb","resources_js_pages_transaction_TableHeader_js":"8b928867ad174e10","resources_js_pages_user_Create_vue":"df31a0fb07fa8152","resources_js_pages_user_Edit_vue":"33996638b9d5702f","resources_js_pages_user_Index_vue":"a6a3db3c64a384c8","resources_js_pages_user_Show_vue":"d9bfdbe52508c33f","resources_js_pages_user_TableHeader_js":"5653ecbcd70fd235"}[chunkId] + "";
57325 57325
 /******/ 		};
57326 57326
 /******/ 	})();
57327 57327
 /******/ 	

+ 3
- 2
resources/js/pages/auth/Login.vue Просмотреть файл

@@ -4,8 +4,8 @@ import AuthSessionSuccess from '@/components/AuthSessionSuccess.vue'
4 4
 import AuthValidationErrors from '@/components/AuthValidationErrors.vue'
5 5
 
6 6
 const form = useForm({
7
-  email: 'admin@laundry.com',
8
-  password: 'admin',
7
+  email: '',
8
+  password: '',
9 9
   remember: false,
10 10
 })
11 11
 
@@ -84,3 +84,4 @@ const submit = () => {
84 84
     </div>
85 85
   </div>
86 86
 </template>
87
+