Commit 89de3228b99f0d629444b411f42e2a27bc857ded

Authored by andryeyev
1 parent e9394ebf

+ FULL fix наложеный платеж

Showing 262 changed files with 74 additions and 2765 deletions   Show diff stats

Too many changes.

To preserve performance only 100 of 262 files are displayed.

account/admin/orders.php
@@ -34,9 +34,7 @@ include_once ($_SERVER['DOCUMENT_ROOT'] . "/account/func/func.php"); @@ -34,9 +34,7 @@ include_once ($_SERVER['DOCUMENT_ROOT'] . "/account/func/func.php");
34 // ================= 34 // =================
35 // ==== status ===== 35 // ==== status =====
36 // ================= 36 // =================
37 -  
38 - // print_r($_POST);  
39 - // exit; 37 +
40 if ((isset ($_POST['action']) && $_POST['action'] == 'status') || trim ($_POST['status']) != '') 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,7 +65,7 @@ include_once ($_SERVER['DOCUMENT_ROOT'] . "/account/func/func.php");
67 } 65 }
68 elseif (isset ($_POST['send']) && $_POST['send'] == 'edit-order') 66 elseif (isset ($_POST['send']) && $_POST['send'] == 'edit-order')
69 { 67 {
70 - 68 +
71 $error = ''; 69 $error = '';
72 $error[] = ValidFormData ($_POST['user']['email'], 'email', 'email'); 70 $error[] = ValidFormData ($_POST['user']['email'], 'email', 'email');
73 $error[] = ValidFormData ($_POST['user']['city'], 'ãîðîä', 'require'); 71 $error[] = ValidFormData ($_POST['user']['city'], 'ãîðîä', 'require');
@@ -1404,31 +1402,45 @@ if (! isset ($_GET['action'])) @@ -1404,31 +1402,45 @@ if (! isset ($_GET['action']))
1404 1402
1405 echo "<label>Ñòðàõîâêà:</label> 1403 echo "<label>Ñòðàõîâêà:</label>
1406 <div class=info><input type='text' name='user[insurance]' style='width:300px;' class=\"validate[required]\" value='" . $order['insurance'] . "' id='insuranceValidate'></div>"; 1404 <div class=info><input type='text' name='user[insurance]' style='width:300px;' class=\"validate[required]\" value='" . $order['insurance'] . "' id='insuranceValidate'></div>";
  1405 +
1407 $sumn_disabled = ""; 1406 $sumn_disabled = "";
1408 if ($_SESSION['admin']['id'] == 22 || $_SESSION['admin']['id'] == 7 || $_SESSION['admin']['id'] == 1 || $_SESSION['admin']['id'] == 19) 1407 if ($_SESSION['admin']['id'] == 22 || $_SESSION['admin']['id'] == 7 || $_SESSION['admin']['id'] == 1 || $_SESSION['admin']['id'] == 19)
1409 $sumn_disabled = ""; 1408 $sumn_disabled = "";
1410 else 1409 else
1411 $sumn_disabled = "disabled"; 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 </div>"; 1441 </div>";
1431 - echo "<label>Ãîðîä:</label> 1442 +
  1443 + echo "<label>Ãîðîä:</label>
1432 <div class=info><input type='text' name='user[city]' style='width:300px;' class=\"validate[required]\" value='" . $order['city'] . "' id='cityValidate'></div> 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 <label>Àäðåñ:</label> 1446 <label>Àäðåñ:</label>
@@ -1446,27 +1458,53 @@ if (! isset ($_GET[&#39;action&#39;])) @@ -1446,27 +1458,53 @@ if (! isset ($_GET[&#39;action&#39;]))
1446 $disabled = "disabled"; 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 echo "</div>"; 1502 echo "</div>";
1468 1503
  1504 + // ==== ×åê ====
  1505 +
1469 $disabled = ""; 1506 $disabled = "";
  1507 +
1470 if ($_SESSION['admin']['id'] != 7 and $_SESSION['admin']['id'] != 17) 1508 if ($_SESSION['admin']['id'] != 7 and $_SESSION['admin']['id'] != 17)
1471 { 1509 {
1472 $disabled = "disabled"; 1510 $disabled = "disabled";
img2/-picno.jpg deleted

2.59 KB

img2/66header.jpg deleted

126 KB

img2/Specialized-logo.png deleted

14.6 KB

img2/Thumbs.db deleted
No preview for this file type
img2/_bgbsk.png deleted

206 Bytes

img2/_header.jpg deleted

82.9 KB

img2/_m_bg.jpg deleted

332 Bytes

img2/_menu_up.gif deleted

1.89 KB

img2/_t2_l.jpg deleted

3.75 KB

img2/_t2_r.jpg deleted

3.75 KB

img2/_title2.jpg deleted

3.63 KB

img2/action.png deleted

1.37 KB

img2/active.png deleted

695 Bytes

img2/admin/Thumbs.db deleted
No preview for this file type
img2/admin/calendar.gif deleted

1010 Bytes

img2/admin/hr1.jpg deleted

744 Bytes

img2/admin/input_ten.jpg deleted

313 Bytes

img2/admin/input_ten_auth.jpg deleted

609 Bytes

img2/admin/k_b_bg.jpg deleted

386 Bytes

img2/admin/k_l.jpg deleted

3.27 KB

img2/admin/k_l_b.jpg deleted

799 Bytes

img2/admin/k_l_bg.jpg deleted

387 Bytes

img2/admin/k_l_t.jpg deleted

798 Bytes

img2/admin/k_r_b.jpg deleted

786 Bytes

img2/admin/k_r_bg.jpg deleted

381 Bytes

img2/admin/k_r_t.jpg deleted

788 Bytes

img2/admin/k_t_bg.jpg deleted

391 Bytes

img2/admin/logo_artweb.jpg deleted

5.42 KB

img2/admin/submit_bg_blue.jpg deleted

323 Bytes

img2/admin/submit_bg_green.jpg deleted

328 Bytes

img2/admin/submit_bg_orange.jpg deleted

329 Bytes

img2/admin/submit_bg_red.jpg deleted

330 Bytes

img2/admin/ugl_l.gif deleted

137 Bytes

img2/admin/ugl_l.jpg deleted

508 Bytes

img2/admin/ugl_l_b.gif deleted

102 Bytes

img2/admin/ugl_l_b.jpg deleted

519 Bytes

img2/admin/ugl_r.gif deleted

135 Bytes

img2/admin/ugl_r.jpg deleted

546 Bytes

img2/admin/ugl_r_b.gif deleted

101 Bytes

img2/admin/ugl_r_b.jpg deleted

551 Bytes

img2/ajax-loader.gif deleted

3.86 KB

img2/artweb.jpg deleted

693 Bytes

img2/b1.jpg deleted

3.86 KB

img2/b2.jpg deleted

4.03 KB

img2/b2rightbasket.png deleted

476 Bytes

img2/banner1.jpg deleted

23.7 KB

img2/banner2.jpg deleted

29.6 KB

img2/banners/banner-1.jpg deleted

26.6 KB

img2/banners/banner-1.png deleted

27.4 KB

img2/banners/burton.gif deleted

16 KB

img2/banners/hotlaine_btn.swf deleted
No preview for this file type
img2/banners/skier-baner-3.swf deleted
No preview for this file type
img2/banners/skier-baner.swf deleted
No preview for this file type
img2/bg2rightbasket.png deleted

162 Bytes

img2/bg_report.jpg deleted

9.24 KB

img2/bgbsk.png deleted

155 Bytes

img2/bgcontact.jpg deleted

5.84 KB

img2/bgrightbasket.png deleted

152 Bytes

img2/biggrin.gif deleted

696 Bytes

img2/black_strelki.gif deleted

58 Bytes

img2/bn1.jpg deleted

10.7 KB

img2/brightbasket.png deleted

467 Bytes

img2/bt1.jpg deleted

601 Bytes

img2/but1.jpg deleted

1.08 KB

img2/c_1.jpg deleted

317 Bytes

img2/c_2.jpg deleted

325 Bytes

img2/c_3.jpg deleted

330 Bytes

img2/c_4.jpg deleted

323 Bytes

img2/c_l.jpg deleted

3.78 KB

img2/c_r.jpg deleted

3.78 KB

img2/calendar.gif deleted

1010 Bytes

img2/com_sub.jpg deleted

532 Bytes

img2/common/arrow.gif deleted

350 Bytes

img2/common/banner.jpg deleted

16.4 KB

img2/common/content_bg.gif deleted

71 Bytes

img2/common/def_parallels_logo.gif deleted

2.44 KB

img2/common/def_plesk_logo.gif deleted

2.24 KB

img2/common/footer_bg.gif deleted

138 Bytes

img2/common/footer_right_bg.png deleted

3.53 KB

img2/common/pdfm_box.jpg deleted

7.76 KB

img2/common/pws_box.jpg deleted

6.6 KB

img2/common/top_bg.gif deleted

533 Bytes

img2/compare.jpg deleted

1.6 KB

img2/confused.gif deleted

698 Bytes

img2/cool.gif deleted

1.08 KB

img2/crazy.gif deleted

946 Bytes

img2/cry.gif deleted

1.06 KB

img2/favicon.ico deleted
No preview for this file type
img2/fon1.jpg deleted

701 Bytes

img2/glyph/btn_asp_bg.gif deleted

1.16 KB

img2/glyph/btn_bg-disabled.gif deleted

434 Bytes

img2/glyph/btn_bg.gif deleted

1.19 KB

img2/glyph/btn_cgi_bg.gif deleted

1.5 KB

img2/glyph/btn_coldfusion_bg.gif deleted

1.31 KB

img2/glyph/btn_fast_cgi_bg.gif deleted

1.65 KB

img2/glyph/btn_miva_bg.gif deleted

1.22 KB

img2/glyph/btn_ok_bg.gif deleted

2 KB

img2/glyph/btn_perl_bg.gif deleted

1.56 KB

img2/glyph/btn_php_bg.gif deleted

1.32 KB