Commit 89de3228b99f0d629444b411f42e2a27bc857ded
+ FULL fix наложеный платеж
Too many changes.
To preserve performance only 100 of 262 files are displayed.
... | ... | @@ -34,9 +34,7 @@ include_once ($_SERVER['DOCUMENT_ROOT'] . "/account/func/func.php"); |
34 | 34 | // ================= |
35 | 35 | // ==== status ===== |
36 | 36 | // ================= |
37 | - | |
38 | - // print_r($_POST); | |
39 | - // exit; | |
37 | + | |
40 | 38 | if ((isset ($_POST['action']) && $_POST['action'] == 'status') || trim ($_POST['status']) != '') |
41 | 39 | { |
42 | 40 | |
... | ... | @@ -67,7 +65,7 @@ include_once ($_SERVER['DOCUMENT_ROOT'] . "/account/func/func.php"); |
67 | 65 | } |
68 | 66 | elseif (isset ($_POST['send']) && $_POST['send'] == 'edit-order') |
69 | 67 | { |
70 | - | |
68 | + | |
71 | 69 | $error = ''; |
72 | 70 | $error[] = ValidFormData ($_POST['user']['email'], 'email', 'email'); |
73 | 71 | $error[] = ValidFormData ($_POST['user']['city'], 'ãîðîä', 'require'); |
... | ... | @@ -1404,31 +1402,45 @@ if (! isset ($_GET['action'])) |
1404 | 1402 | |
1405 | 1403 | echo "<label>Ñòðàõîâêà:</label> |
1406 | 1404 | <div class=info><input type='text' name='user[insurance]' style='width:300px;' class=\"validate[required]\" value='" . $order['insurance'] . "' id='insuranceValidate'></div>"; |
1405 | + | |
1407 | 1406 | $sumn_disabled = ""; |
1408 | 1407 | if ($_SESSION['admin']['id'] == 22 || $_SESSION['admin']['id'] == 7 || $_SESSION['admin']['id'] == 1 || $_SESSION['admin']['id'] == 19) |
1409 | 1408 | $sumn_disabled = ""; |
1410 | 1409 | else |
1411 | 1410 | $sumn_disabled = "disabled"; |
1412 | - echo "<label>Ñóììà íàëîæåííîãî:</label> | |
1413 | - <div class=info><input type='text' name='user[sumn]' style='width:300px;' class=\"validate[required]\" value='" . $order['sumn'] . "' id='sumnValidate' $sumn_disabled></div><br />"; | |
1414 | - $array_method = array ( | |
1415 | - "Ïîëó÷àòåëÿ", | |
1416 | - "Îòïðàâèòåëÿ" | |
1417 | - ); | |
1418 | - echo " | |
1419 | - <div class=info> | |
1420 | - <label>Îòïðàâêà çà ñ÷åò:</label> | |
1421 | - <select name='user[sends]' style='width:300px'><option value=''></option>"; | |
1422 | - foreach ($array_method as $method) | |
1411 | + | |
1412 | + echo " | |
1413 | + <label>Ñóììà íàëîæåííîãî:</label> | |
1414 | + <div class=info> | |
1415 | + <input type='text' name='user[sumn]' style='width:300px;' class=\"validate[required]\" value='" . $order['sumn'] . "' id='sumnValidate' $sumn_disabled>"; | |
1416 | + | |
1417 | + if ($sumn_disabled != '') | |
1423 | 1418 | { |
1424 | - echo '<option value="' . $method . '" '; | |
1425 | - if ($order['sends'] == $method) | |
1426 | - echo 'selected'; | |
1427 | - echo '>' . $method . '</option>'; | |
1419 | + echo "<input type='hidden' name='user[sumn]' style='width:300px;' class=\"validate[required]\" value='" . $order['sumn'] . "' id='sumnValidate'>"; | |
1428 | 1420 | } |
1429 | - echo "</select> | |
1421 | + | |
1422 | + echo " | |
1423 | + </div><br /> | |
1424 | + <div class=info> | |
1425 | + <label>Îòïðàâêà çà ñ÷åò:</label> | |
1426 | + <select name='user[sends]' style='width:300px'> | |
1427 | + <option value=''></option>"; | |
1428 | + | |
1429 | + // àõàõà | |
1430 | + foreach ( | |
1431 | + array ( | |
1432 | + "Ïîëó÷àòåëÿ", | |
1433 | + "Îòïðàâèòåëÿ" | |
1434 | + ) as $method) | |
1435 | + { | |
1436 | + echo '<option value="' . $method . '" '.($order['sends'] == $method ? 'selected' : '').'>' . $method . '</option>'; | |
1437 | + } | |
1438 | + | |
1439 | + echo " | |
1440 | + </select> | |
1430 | 1441 | </div>"; |
1431 | - echo "<label>Ãîðîä:</label> | |
1442 | + | |
1443 | + echo "<label>Ãîðîä:</label> | |
1432 | 1444 | <div class=info><input type='text' name='user[city]' style='width:300px;' class=\"validate[required]\" value='" . $order['city'] . "' id='cityValidate'></div> |
1433 | 1445 | |
1434 | 1446 | <label>Àäðåñ:</label> |
... | ... | @@ -1446,27 +1458,53 @@ if (! isset ($_GET['action'])) |
1446 | 1458 | $disabled = "disabled"; |
1447 | 1459 | } |
1448 | 1460 | } |
1449 | - // print_r($_SESSION['admin']['group']); | |
1450 | - echo " | |
1451 | - <label>Ìåíåäæåð:</label> | |
1452 | - <div class=info><select name='meneger' $disabled> | |
1453 | - <option value='0' " . (($_SESSION['admin']['group'] != 1) ? 'disabled' : '') . "></option>"; | |
1454 | 1461 | |
1455 | - $selected = ($order['meneger'] > 0) ? $order['meneger'] : $_SESSION['admin']['id']; | |
1462 | + // ==== Ìåíåäæåð ==== | |
1456 | 1463 | |
1457 | - $result_1 = mysql_query ("select * from zlo_admin"); | |
1458 | - while ($row = mysql_fetch_assoc ($result_1)) | |
1459 | - { | |
1460 | - echo "<option value='" . $row["id"] . "' " . (($selected == $row["id"]) ? 'selected' : '') . " " . (($_SESSION['admin']['group'] != 1 && $selected != $row["id"]) ? 'disabled' : '') . ">" . $row["username"] . "</option>"; | |
1461 | - } | |
1462 | - echo "</select>"; | |
1463 | - if ($disabled == "disabled") | |
1464 | + $disabled = ""; | |
1465 | + | |
1466 | + if ($_SESSION['admin']['group'] != 1) | |
1464 | 1467 | { |
1465 | - echo "<input type='hidden' name='meneger' value='" . $order['meneger'] . "'>"; | |
1468 | + $disabled = "disabled"; | |
1466 | 1469 | } |
1470 | + | |
1471 | + echo " | |
1472 | + <label>Ìåíåäæåð:</label> | |
1473 | + <div class=info> | |
1474 | + <select name='meneger'>"; | |
1475 | + | |
1476 | + $mass_manager = array (); | |
1477 | + | |
1478 | + $result_1 = mysql_query ("select * from zlo_admin"); | |
1479 | + while ($row = mysql_fetch_assoc ($result_1)) | |
1480 | + { | |
1481 | + if ($order['meneger'] == 0) | |
1482 | + { | |
1483 | + $manager_id = $_SESSION['admin']['id']; | |
1484 | + $disabled = $row["id"] != $manager_id ? 'disabled' : ''; | |
1485 | + } | |
1486 | + else | |
1487 | + { | |
1488 | + $manager_id = $order['meneger']; | |
1489 | + $disabled = 'disabled'; | |
1490 | + } | |
1491 | + | |
1492 | + if ($manager_id == $row["id"] || $_SESSION['admin']['group'] == 1) | |
1493 | + { | |
1494 | + $disabled = ''; | |
1495 | + } | |
1496 | + | |
1497 | + echo "<option value='" . $row["id"] . "' " . ($manager_id == $row["id"] ? 'selected' : '') . " ".$disabled.">" . $row["username"] . "</option>"; | |
1498 | + } | |
1499 | + | |
1500 | + echo "</select>"; | |
1501 | + | |
1467 | 1502 | echo "</div>"; |
1468 | 1503 | |
1504 | + // ==== ×åê ==== | |
1505 | + | |
1469 | 1506 | $disabled = ""; |
1507 | + | |
1470 | 1508 | if ($_SESSION['admin']['id'] != 7 and $_SESSION['admin']['id'] != 17) |
1471 | 1509 | { |
1472 | 1510 | $disabled = "disabled"; | ... | ... |
2.59 KB
126 KB
14.6 KB
206 Bytes
82.9 KB
332 Bytes
1.89 KB
3.75 KB
3.75 KB
3.63 KB
1.37 KB
695 Bytes
1010 Bytes
744 Bytes
313 Bytes
609 Bytes
386 Bytes
3.27 KB
799 Bytes
387 Bytes
798 Bytes
786 Bytes
381 Bytes
788 Bytes
391 Bytes
5.42 KB
323 Bytes
328 Bytes
329 Bytes
330 Bytes
137 Bytes
508 Bytes
102 Bytes
519 Bytes
135 Bytes
546 Bytes
101 Bytes
551 Bytes
3.86 KB
693 Bytes
3.86 KB
4.03 KB
476 Bytes
23.7 KB
29.6 KB
26.6 KB
27.4 KB
16 KB
162 Bytes
9.24 KB
155 Bytes
5.84 KB
152 Bytes
696 Bytes
58 Bytes
10.7 KB
467 Bytes
601 Bytes
1.08 KB
317 Bytes
325 Bytes
330 Bytes
323 Bytes
3.78 KB
3.78 KB
1010 Bytes
532 Bytes
350 Bytes
16.4 KB
71 Bytes
2.44 KB
2.24 KB
138 Bytes
3.53 KB
7.76 KB
6.6 KB
533 Bytes
1.6 KB
698 Bytes
1.08 KB
946 Bytes
1.06 KB
701 Bytes
1.16 KB
434 Bytes
1.19 KB
1.5 KB
1.31 KB
1.65 KB
1.22 KB
2 KB
1.56 KB
1.32 KB