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;