mirror of
https://github.com/anna-sara/lan_kiosk
synced 2026-03-16 11:45:40 +01:00
Added Matomo script and checkbox for give_leftover
This commit is contained in:
parent
3b32285863
commit
bb9e62c75a
4 changed files with 46 additions and 6 deletions
|
|
@ -33,7 +33,7 @@ class DepositController extends Controller
|
||||||
$request->validate([
|
$request->validate([
|
||||||
'customer_id' => 'required',
|
'customer_id' => 'required',
|
||||||
'deposit' => 'required',
|
'deposit' => 'required',
|
||||||
//'give_leftover' => 'nullable'
|
'give_leftover' => 'nullable'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($request->manual_deposit === 1) {
|
if ($request->manual_deposit === 1) {
|
||||||
|
|
@ -54,7 +54,7 @@ class DepositController extends Controller
|
||||||
$groupCustomer = Customer::where('customer_group_id', $customer->customer_group_id)->where('is_in_group', 0)->first();
|
$groupCustomer = Customer::where('customer_group_id', $customer->customer_group_id)->where('is_in_group', 0)->first();
|
||||||
$groupCustomer->deposit += $request->deposit;
|
$groupCustomer->deposit += $request->deposit;
|
||||||
$groupCustomer->amount_left += $request->deposit;
|
$groupCustomer->amount_left += $request->deposit;
|
||||||
//$groupCustomer->give_leftover = $request->give_leftover;
|
$groupCustomer->give_leftover = $request->give_leftover;
|
||||||
$groupCustomer->save();
|
$groupCustomer->save();
|
||||||
$customer->deposit = 0;
|
$customer->deposit = 0;
|
||||||
$customer->save();
|
$customer->save();
|
||||||
|
|
@ -70,7 +70,7 @@ class DepositController extends Controller
|
||||||
} else {
|
} else {
|
||||||
$customer->deposit = $customer->deposit + $request->deposit;
|
$customer->deposit = $customer->deposit + $request->deposit;
|
||||||
$customer->amount_left = $customer->amount_left + $request->deposit;
|
$customer->amount_left = $customer->amount_left + $request->deposit;
|
||||||
//$customer->give_leftover = $request->give_leftover;
|
$customer->give_leftover = $request->give_leftover;
|
||||||
$customer->save();
|
$customer->save();
|
||||||
|
|
||||||
if ($request->manual_deposit === 1) {
|
if ($request->manual_deposit === 1) {
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,8 @@ export default function Customer({customer, groupmembers}: (CustomerProps & Grou
|
||||||
deposit: "",
|
deposit: "",
|
||||||
id: customer.id,
|
id: customer.id,
|
||||||
comment: "",
|
comment: "",
|
||||||
manual_deposit: 0
|
manual_deposit: 0,
|
||||||
|
give_leftover: 0
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -62,7 +63,7 @@ export default function Customer({customer, groupmembers}: (CustomerProps & Grou
|
||||||
const submitDeposit: FormEventHandler = (e) => {
|
const submitDeposit: FormEventHandler = (e) => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
post(route('register_deposit'), {
|
post(route('register_deposit'), {
|
||||||
headers: {'X-API-KEY': '123', 'Accept': 'application/json', 'Content-Type': 'application/json'},
|
//headers: {'X-API-KEY':`${import.meta.env.API_KEY_DEPOSIT}`,'Accept': 'application/json', 'Content-Type': 'application/json'},
|
||||||
onFinish: () => setData(
|
onFinish: () => setData(
|
||||||
'deposit', ''
|
'deposit', ''
|
||||||
),
|
),
|
||||||
|
|
@ -83,6 +84,8 @@ export default function Customer({customer, groupmembers}: (CustomerProps & Grou
|
||||||
.catch(error => {console.log(error)})
|
.catch(error => {console.log(error)})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log( import.meta.env.API_KEY_DEPOSIT)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AuthenticatedLayout>
|
<AuthenticatedLayout>
|
||||||
<Head title="Deltagare" />
|
<Head title="Deltagare" />
|
||||||
|
|
@ -194,6 +197,25 @@ export default function Customer({customer, groupmembers}: (CustomerProps & Grou
|
||||||
onChange={(e) => [setData('deposit', e.target.value), setData('manual_deposit', 1)]}
|
onChange={(e) => [setData('deposit', e.target.value), setData('manual_deposit', 1)]}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="control mt-4 mb-4">
|
||||||
|
<p>Ge överblivet saldo till vBytes:</p>
|
||||||
|
<label className="radio mr-3 mt-3">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
checked={customer.give_leftover === 1}
|
||||||
|
onChange={() => setData('give_leftover', 1)}
|
||||||
|
/>
|
||||||
|
Ja
|
||||||
|
</label>
|
||||||
|
<label className="radio">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
checked={customer.give_leftover === 0}
|
||||||
|
onChange={() => setData('give_leftover', 0)}
|
||||||
|
/>
|
||||||
|
Nej
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="field is-grouped">
|
<div className="field is-grouped">
|
||||||
<div className="control">
|
<div className="control">
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<title inertia>{{ config('app.name', 'Laravel') }}</title>
|
<title inertia>{{ config('app.name', 'Laravel') }}</title>
|
||||||
|
|
||||||
|
|
@ -15,6 +17,21 @@
|
||||||
@viteReactRefresh
|
@viteReactRefresh
|
||||||
@vite(['resources/js/app.tsx', "resources/js/Pages/{$page['component']}.tsx"])
|
@vite(['resources/js/app.tsx', "resources/js/Pages/{$page['component']}.tsx"])
|
||||||
@inertiaHead
|
@inertiaHead
|
||||||
|
<!-- Matomo -->
|
||||||
|
<script>
|
||||||
|
var _paq = window._paq = window._paq || [];
|
||||||
|
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
|
||||||
|
_paq.push(['trackPageView']);
|
||||||
|
_paq.push(['enableLinkTracking']);
|
||||||
|
(function() {
|
||||||
|
var u="https://analytics.vbytes.se/";
|
||||||
|
_paq.push(['setTrackerUrl', u+'matomo.php']);
|
||||||
|
_paq.push(['setSiteId', '27']);
|
||||||
|
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
|
||||||
|
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
|
<!-- End Matomo Code -->
|
||||||
</head>
|
</head>
|
||||||
<body class="font-sans antialiased">
|
<body class="font-sans antialiased">
|
||||||
@inertia
|
@inertia
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ Route::middleware('auth:sanctum')->group(function () {
|
||||||
Route::delete('customer-group/{id}', [CustomerGroupController::class, 'destroy'])->name('delete_customer_group');
|
Route::delete('customer-group/{id}', [CustomerGroupController::class, 'destroy'])->name('delete_customer_group');
|
||||||
Route::delete('customer/{id}', [CustomerController::class, 'destroy'])->name('delete_customer');
|
Route::delete('customer/{id}', [CustomerController::class, 'destroy'])->name('delete_customer');
|
||||||
Route::put('customer/{id}', [CustomerController::class, 'edit'])->name('edit_customer');
|
Route::put('customer/{id}', [CustomerController::class, 'edit'])->name('edit_customer');
|
||||||
|
Route::post('register_deposit', [DepositController::class, 'store'])->name('register_deposit');
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::post('register_deposit', [DepositController::class, 'store'])->name('register_deposit')->middleware([ApiToken::class]);
|
//Route::post('register_deposit', [DepositController::class, 'store'])->name('register_deposit')->middleware([ApiToken::class]);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue