#62 добавлены проверки на наличие файлов

front/src/components/Account/Account.js

@@ -38,8 +38,8 @@ const Account = ({ registry, payments, approve, cancelApprove, pay, cancelPay, s
             <th>Сумма платежа</th>
             <th>Инициатор</th>
             <th>Файл</th>
-            <th>Статус платежа</th>            
             {user && user.role.includes('addPayment') && <th>Повтор платежа</th>}
+            <th>Статус платежа</th>                        
           </tr>
         </thead>
         <tbody>
@@ -61,10 +61,21 @@ const Account = ({ registry, payments, approve, cancelApprove, pay, cancelPay, s
               <td>{payment.priority}</td>
               <td>{payment.sum}</td>
               <td>{`${payment.user && payment.user.surname} ${payment.user && payment.user.name}`}</td>
-              <td>
+              <td>{payment.image? <>
                 <span onClick={() => openModal(apiURL + "/uploads/" + payment.image)}>Посмотреть</span><br />
-                <a onClick={()=> download(apiURL + "/uploads/" + payment.image, "file.jpg")}>Скачать</a>                
+                <a onClick={()=> download(apiURL + "/uploads/" + payment.image, "file.jpg")}>Скачать</a>
+                </> : <span>Файл отсутствует</span>
+              }                                
               </td>
+              {registry && user && (user._id===payment.user._id || user.role.includes('approvePayment'))?<td>
+                {payment.repeatability? (
+                  <> 
+                  <span >да</span>
+                  <button className="Account__btn" onClick={() => stopRepeatability(payment._id)}>Отменить</button>
+                  </>
+                  ): <span >нет</span>}
+                </td>:user && user.role.includes('viewAllPayments') && <td>
+                {!payment.repeatability? <span >нет</span> : <span >да</span>}</td>}
               {!registry && user && user.role.includes('viewAllPayments') && <td onClick ={e => statusDateChange(e)}>
                 {!payment.approved && <span style={{ color: 'red' }}>Не подтвержден</span>}
                 {payment.approved && !payment.paided && <span style={{ color: 'orange' }}>Подтвержден</span>}
@@ -92,16 +103,6 @@ const Account = ({ registry, payments, approve, cancelApprove, pay, cancelPay, s
                   <button className="Account__btn" onClick={() => cancelPay(payment._id)}>Отменить</button>
                   </>)}
                 </td>}
-              
-              {registry && user && (user._id===payment.user._id || user.role.includes('approvePayment'))?<td>
-                {payment.repeatability? (
-                  <> 
-                  <span >да</span>
-                  <button className="Account__btn" onClick={() => stopRepeatability(payment._id)}>Отменить</button>
-                  </>
-                  ): <span >нет</span>}
-                </td>:user && user.role.includes('viewAllPayments') && <td>
-                {!payment.repeatability? <span >нет</span> : <span >да</span>}</td>}
             </tr>
           ))}
         </tbody>

front/src/containers/PaymentById/PaymentById.js

@@ -43,10 +43,10 @@ const PaymentById = () => {
                     <p><b>Повторящийся платеж:</b> {payment.repeatability? "да": "нет"}</p>
                     <p><b>Периодичность платежа:</b> {periodicity}</p>   
                 </div>
-                <div>
-                    <p className="flex-column"><b>Счет:</b> 
-                        <img src={apiURL + "/uploads/" + payment.image} alt={payment.image}/>
-                    </p>
+                <div className="flex-column">
+                    <h4>Счет:</h4> 
+                        {payment.image? <img src={apiURL + "/uploads/" + payment.image} alt={payment.image}/>: <p>Счет отсутствует</p>}
+                    
                 </div>
             </div>