mirror of
https://github.com/dimoniche/solarium.vlad.git
synced 2026-01-30 04:53:30 +03:00
Исправление ошибок
This commit is contained in:
parent
b12e01fc3e
commit
e1f4954a0b
@ -933,14 +933,16 @@ void AppVladEventProcess(CPU_INT32U event)
|
||||
abonement_data* data = get_abonement_data();
|
||||
CPU_INT32U password;
|
||||
GetData(&PassDescAdmin, &password, 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
|
||||
CPU_INT32U moneytopay = app_state.moneytopay/100;
|
||||
|
||||
if(read_mifare_card() != NULL
|
||||
&& data->money + data->bonus > app_state.moneytopay
|
||||
&& data->money + data->bonus > moneytopay
|
||||
&& data->uid[0] == password)
|
||||
{
|
||||
int32_t delta = data->money - app_state.moneytopay;
|
||||
int32_t delta = data->money - moneytopay;
|
||||
data->bonus -= (delta < 0) ? delta : 0;
|
||||
data->money -= (delta < 0) ? data->money : app_state.moneytopay;
|
||||
data->money -= (delta < 0) ? data->money : moneytopay;
|
||||
|
||||
if(!write_mifare_card())
|
||||
{
|
||||
@ -1127,7 +1129,7 @@ void AppVladEventProcess(CPU_INT32U event)
|
||||
{
|
||||
/// ïå÷àòü ÷åêà òåðìèíàëà
|
||||
SetTermCommand(TERM_COMMAND_CLEAR_STATE, NULL);
|
||||
SetAcceptedMoney(app_state.abonementtopay);
|
||||
//SetAcceptedMoney(app_state.abonementtopay);
|
||||
SaveEventRecord(app_state.current_abonement, JOURNAL_EVENT_CARD_ACCEPTED, app_state.abonementtopay);
|
||||
if (term_protocol() == TERMINAL_PROTOCOL_TTK2) PrintCardBill();
|
||||
app_state.user_menu = USER_MENU_INSERT_BONUS_CARD;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user