исправление ошибок.

PROJECT/app/app_vlad.c

@@ -31,7 +31,7 @@ extern CPU_INT32U ChannelsPayedTime[CHANNELS_NUM];
 
 ApplicationState app_state;
 
-static CPU_INT08U fr_conn_ctr = 0;
+//static CPU_INT08U fr_conn_ctr = 0;
 static CPU_INT08U cash_accept_enabled = 0;
 static CPU_INT08U incassation = 0;
 extern int player_conn;
@@ -686,7 +686,7 @@ void AppVladEventProcess(CPU_INT32U event)
                 }
                 
                 // ïðîâåðèì ôèñêàëüíèê, åñëè îí îòâàëèëñÿ
-                if ((++fr_conn_ctr % 10) == 0)
+                /*if ((++fr_conn_ctr % 10) == 0)
                 {
                     if ((FiscalConnState == FISCAL_NOCONN) || (TstCriticalFiscalError()))
                     {
@@ -695,7 +695,7 @@ void AppVladEventProcess(CPU_INT32U event)
                             CheckFiscalStatus();
                         }
                     }
-                }
+                }*/
                 
                 // ñåðâåð îøèáîê
                 ErrorServer();
@@ -801,7 +801,11 @@ void AppVladEventProcess(CPU_INT32U event)
         
                                 CPU_INT32U password;
                                 GetData(&PassDescAdmin, &password, 0, DATA_FLAG_SYSTEM_INDEX);
-                                if(get_abonement_data()->uid[0] != password) break;
+                                if(get_abonement_data()->uid[0] != password)
+                                {
+                                    stop_card_working();
+                                    break;
+                                }
 
                                 if(app_state.user_menu == USER_MENU_IDLE)
                                 {
@@ -817,6 +821,10 @@ void AppVladEventProcess(CPU_INT32U event)
                                     app_state.user_menu = USER_MENU_BALANCE_CARD;
                                     PrintBalanceMenu();
                                     RefreshMenu();
+
+                                    abonement_data* data = get_abonement_data();
+                                    SaveEventRecord(data->bonus, JOURNAL_EVENT_ABONEMENT_BALANCE, data->money);
+
                                     PlayMusicFile(41);
                                 }
                             } else {
@@ -874,7 +882,7 @@ void AppVladEventProcess(CPU_INT32U event)
                                     
                                     SetData(&CounterAbonementMoneyDesc, &all_counter_money, 0, DATA_FLAG_DIRECT_INDEX);
 
-                                    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L;
+                                    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L * 60L;
 
                                     data->money += pay;
                                     data->bonus = bonus;
@@ -884,12 +892,14 @@ void AppVladEventProcess(CPU_INT32U event)
                                     if(!write_mifare_card())
                                     {
                                         app_state.user_menu = USER_MENU_IDLE;
+                                        SaveEventRecord(bonus, JOURNAL_EVENT_ABONEMENT_PAY_REJECTED, pay);
                                     }
                                     else
                                     {
                                         app_state.user_menu = USER_MENU_FINISH_PAY_BONUS_CARD;
                                         PrintFinishPayMenu();
                                         RefreshMenu();
+                                        SaveEventRecord(bonus, JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED, pay);
                                         PlayMusicFile(52);
                                     }
                                 }
@@ -976,19 +986,12 @@ void AppVladEventProcess(CPU_INT32U event)
                 {
                     if (OSTimeGet() - app_state.last_card_manipulation_time > MENU_CARD_MANIPULATION_TIMEOUT_MS)
                     {
-                        app_state.user_menu = USER_MENU_IDLE;
+                        app_state.user_menu = USER_MENU_START_INSERT_CARD_MONEY;
-                        app_state.ch_index = 0;
+                        PrintMenuStartPay();
-                        app_state.mode_index = 0;
-                        app_state.pay_index = 0;
-                        app_state.current_abonement = 0;
-                        PrintHelloMenu();
                         RefreshMenu();
+                        PlayMusicFile(42);
                     }
                 }
-                else if(app_state.user_menu == USER_MENU_START_INSERT_CARD_MONEY)
-                {
-                    //PrintMenuStartPay();
-                }
                 else if(app_state.user_menu == USER_MENU_ALL_PRICE)
                 {
                     //PrintMenuAllPrice(app_state.blink_ctr >= 500);
@@ -1011,6 +1014,7 @@ void AppVladEventProcess(CPU_INT32U event)
                          || (app_state.user_menu == USER_MENU_SELECT_CH_CLEANING) 
                          || (app_state.user_menu == USER_MENU_SELECT_CH_SERVICE) 
                          || (app_state.user_menu == USER_MENU_SELECT_CH_TESTMODE)
+                         || (app_state.user_menu == USER_MENU_START_INSERT_CARD_MONEY)
                          )
                 {
                     if (OSTimeGet() - app_state.last_key_time > MENU_KEY_PRESS_TIMEOUT_MS)
@@ -1027,7 +1031,7 @@ void AppVladEventProcess(CPU_INT32U event)
                 else if (app_state.user_menu == USER_MENU_CASH_PAYING)
                 { 
                     // ïðèíèìàåì íàëè÷íûå
-                    CheckFiscalStatus();
+                    //CheckFiscalStatus();
                     // âêëþ÷èì çàíîâî ïðèåì äåíåã, åñëè áûëà îøèáêà â ýòîì æå ìåíþ
                     if (!cash_accept_enabled)
                     {
@@ -1051,7 +1055,7 @@ void AppVladEventProcess(CPU_INT32U event)
                 }
                 else if (app_state.user_menu == USER_MENU_CARD_PROCESSING)  // åñëè â ìåíþ ïðèåìà áàíêîâñêîé êàðòû
                 {
-                    CheckFiscalStatus();
+                    //CheckFiscalStatus();
                     if (GetTermState() == TERM_STATE_DONE_PUR)
                     {
                         /// ïå÷àòü ÷åêà òåðìèíàëà
@@ -1079,7 +1083,7 @@ void AppVladEventProcess(CPU_INT32U event)
                 }
                 else if (app_state.user_menu == USER_MENU_INSERT_BANK_CARD)  // åñëè â ìåíþ ïðèåìà áàíêîâñêîé êàðòû äëÿ àáîíåìåíòà
                 {
-                    CheckFiscalStatus();
+                    //CheckFiscalStatus();
                     if (GetTermState() == TERM_STATE_DONE_PUR)
                     {
                         /// ïå÷àòü ÷åêà òåðìèíàëà
@@ -1096,6 +1100,7 @@ void AppVladEventProcess(CPU_INT32U event)
                         SaveEventRecord(app_state.current_abonement, JOURNAL_EVENT_CARD_REJECTED, 0);
                         PrintAnotherCardMenu();
                         RefreshMenu();
+                        PlayMusicFile(51);
                         app_state.user_menu = USER_MENU_ERROR_BANK_CARD;
                         app_state.menu_timeout = MENU_CARD_FAIL_TIMEOUT;
                     }
@@ -1324,13 +1329,18 @@ void AppVladEventProcess(CPU_INT32U event)
             }
             else if(app_state.user_menu == USER_MENU_START_PAY_CARD)
             {
+                uint32_t pay = 0;
+                GetData(&AbonementMoneyDesc, &pay, app_state.current_abonement, DATA_FLAG_DIRECT_INDEX);
+                app_state.abonementtopay = pay;
+
                 uint32_t param[TERM_PARAM_COUNT];
                 param[0] = app_state.abonementtopay;
                 SetTermCommand(TERM_COMMAND_PEND_PUR, param);
                 app_state.user_menu = USER_MENU_INSERT_BANK_CARD;
                 PrintInsertBankCardMenu();
                 RefreshMenu();
-                //PlayMusicFile(49);
+                StopMusic();
+                PlayMusicFile(49);
             }
             else if (app_state.user_menu == USER_MENU_WARNING_1)
             {
@@ -1535,6 +1545,7 @@ void AppVladEventProcess(CPU_INT32U event)
 
                     PrintInsertBonusCardMenu();
                     RefreshMenu();
+                    PlayMusicFile(50);
                 }
             }
             else if (app_state.user_menu == USER_MENU_SELECT_SERVICE_TIME)
@@ -1617,6 +1628,7 @@ void AppVladEventProcess(CPU_INT32U event)
                 // ïîïîëíåíèå êàðòû çàêîí÷èëè - ñîîáùèì îá ýòîì
                 PrintInsertBonusCardMenu();
                 RefreshMenu();
+                PlayMusicFile(50);
             }
         break;
         case EVENT_FINISH_PAYMENT_ABONEMENT_SOLARIUM:
@@ -1697,7 +1709,7 @@ void AppVladEventProcess(CPU_INT32U event)
                 }
 
                 // íàïå÷àòàåì ÷åê
-                if (IsFiscalConnected())
+                /*if (IsFiscalConnected())
                 {
                     CPU_INT32U format;
                     char service_name[48];
@@ -1718,7 +1730,7 @@ void AppVladEventProcess(CPU_INT32U event)
                         // îøèáêà ïå÷àòè ÷åêà
                     
                     }
-                }
+                }*/
 
                 IncCounter(app_state.ch_index, ChannelsPayedTime[app_state.ch_index], accmoney, app_state.user_menu == USER_MENU_CARD_OK);
                 IncSolarCounters(app_state.ch_index, app_state.mode_index, ChannelsPayedTime[app_state.ch_index], accmoney, app_state.user_menu == USER_MENU_CARD_OK);
@@ -2545,7 +2557,7 @@ void PrintSilverMenu(void)
     GetData(&AbonementBonusDesc, &bonus_silver, 0, DATA_FLAG_DIRECT_INDEX);
     GetData(&AbonementBestBeforeDesc, &best_before, 0, DATA_FLAG_DIRECT_INDEX);
 
-    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L;
+    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L * 60L;
 
     PrintUserMenuStr("Ñåðåáðÿííûé àáîíåìåíò", 0);
 
@@ -2570,7 +2582,7 @@ void PrintGoldMenu(void)
     GetData(&AbonementBonusDesc, &bonus_gold, 1, DATA_FLAG_DIRECT_INDEX);
     GetData(&AbonementBestBeforeDesc, &best_before, 1, DATA_FLAG_DIRECT_INDEX);
 
-    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L;
+    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L * 60L;
 
     PrintUserMenuStr(" Çîëîòîé àáîíåìåíò  ", 0);
 
@@ -2595,7 +2607,7 @@ void PrintPlatMenu(void)
     GetData(&AbonementBonusDesc, &bonus_plat, 2, DATA_FLAG_DIRECT_INDEX);
     GetData(&AbonementBestBeforeDesc, &best_before, 2, DATA_FLAG_DIRECT_INDEX);
 
-    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L;
+    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L * 60L;
 
     PrintUserMenuStr("Ïëàòèíîâûé àáîíåìåíò", 0);
 
@@ -2620,7 +2632,7 @@ void PrintDiamondMenu(void)
     GetData(&AbonementBonusDesc, &bonus_diamond, 3, DATA_FLAG_DIRECT_INDEX);
     GetData(&AbonementBestBeforeDesc, &best_before, 3, DATA_FLAG_DIRECT_INDEX);
 
-    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L;
+    uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L * 60L;
 
     PrintUserMenuStr(" Àëìàçíûé àáîíåìåíò ", 0);
 

PROJECT/app/journal.c

@@ -200,6 +200,15 @@ void GetEventStr(char* str, char event)
     case JOURNAL_EVENT_ABONEMENT_REJECTED:
       sprintf(str, "ÁÊÇ.îïëàòà ");
       break;
+    case JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED:
+      sprintf(str, "ÁÊÇ.ïîïîëíåíèå ");
+      break;
+    case JOURNAL_EVENT_ABONEMENT_PAY_REJECTED:
+      sprintf(str, "ÁÊÇ.ïîïîëíåíèå ");
+      break;
+    case JOURNAL_EVENT_ABONEMENT_BALANCE:
+      sprintf(str, "ÁÊÇ.áàëàíñ ");
+      break;
     case JOURNAL_EVENT_START_SESSION:
       #if defined(BOARD_CENTRAL_CARWASH)
           sprintf(str, "Íà÷.ðàáîòû ");

PROJECT/app/journal.h

@@ -103,9 +103,14 @@ typedef struct{
     #define ERROR_FR                        53
 
     #define JOURNAL_EVENT_ABONEMENT_ACCEPTED    54  // ïðèíÿò àáîíåìåíò, ñóììà áåçíàëà
-    #define JOURNAL_EVENT_ABONEMENT_REJECTED    55  // àáîíåìåíò îòêëîíåíà
+    #define JOURNAL_EVENT_ABONEMENT_REJECTED    55  // àáîíåìåíò îòêëîíåí
 
-    #define JOURNAL_EVENTS_COUNT             (JOURNAL_EVENT_ABONEMENT_REJECTED+FR_ERROR_NUMBER)  // ÷èñëî ñîáûòèé
+    #define JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED    56  // êóïëåí àáîíåìåíò, ñóììà áåçíàëà
+    #define JOURNAL_EVENT_ABONEMENT_PAY_REJECTED    57  // ïîêóïêà àáîíåìåíòà îòêëîíåíà
+
+    #define JOURNAL_EVENT_ABONEMENT_BALANCE         58  // ÷òåíèå áàëàíñà
+
+    #define JOURNAL_EVENTS_COUNT             (JOURNAL_EVENT_ABONEMENT_BALANCE+FR_ERROR_NUMBER)  // ÷èñëî ñîáûòèé
 
   // êàíàë
   CPU_INT08U channel;

PROJECT/menu/menudesc.c

@@ -2350,6 +2350,27 @@ void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_da
 			sprintf(str_data, "%d ðóá.", record->data);
           #endif
         }
+      else if (record->event == JOURNAL_EVENT_ABONEMENT_ACCEPTED)
+        {
+            sprintf(str_data, "%dðóá %dÁ", record->data, record->channel);
+        }
+      else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED)
+        {
+            sprintf(str_data, "%dðóá %dÁ", record->data, record->channel);
+        }
+      else if (record->event == JOURNAL_EVENT_ABONEMENT_REJECTED)
+        {
+            sprintf(str_data, "Îòêàç %dðóá %dÁ", record->data, record->channel);
+        }
+      else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_REJECTED)
+        {
+          sprintf(&str_event[strlen(str_event)], "Ïîñò %d", record->channel+1);
+          strcpy(str_data, "Îòêàç");
+        }
+      else if (record->event == JOURNAL_EVENT_ABONEMENT_BALANCE)
+        {
+            sprintf(str_data, "%dðóá %dÁ", record->data, record->channel);
+        }
       else if (record->event == JOURNAL_EVENT_CARD_REJECTED)
         {
           sprintf(&str_event[strlen(str_event)], "Ïîñò %d", record->channel+1);