From e1f4954a0b4b69e1a3b71be5c0f3a720cf39d309 Mon Sep 17 00:00:00 2001 From: dimoniche Date: Fri, 23 May 2025 00:46:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROJECT/app/app_vlad.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PROJECT/app/app_vlad.c b/PROJECT/app/app_vlad.c index 2f08132..d5c4725 100644 --- a/PROJECT/app/app_vlad.c +++ b/PROJECT/app/app_vlad.c @@ -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;