Commit 752c72a796725d1edc058216d0f3672147024e58
1 parent
c8c89698
+ fix валидация перед сохранением
Showing
2 changed files
with
22 additions
and
17 deletions
Show diff stats
account/admin/orders.php
@@ -1863,7 +1863,7 @@ if (! isset ($_GET['action'])) | @@ -1863,7 +1863,7 @@ if (! isset ($_GET['action'])) | ||
1863 | // cìåíèòü ñòàòóñ | 1863 | // cìåíèòü ñòàòóñ |
1864 | echo "<!--<div id='records'><input type='submit' value='Ïåðåâåñòè' class='button-save' onclick=\"if(document.getElementById('mcomment').value=='' && document.getElementById('PerPage').value=='5'){ alert('Äëÿ ñìåíû ñòàòóñà çàêàçà íà \'Îòìåíåí\', îáÿçàòåëüíî, çàïîëíåíèå ïîëÿ \'Êîìåíòàðèé (ìåíåäæåðà)\''); return false;} else document.forms['SetStatus'].submit();\" ></div>-->"; | 1864 | echo "<!--<div id='records'><input type='submit' value='Ïåðåâåñòè' class='button-save' onclick=\"if(document.getElementById('mcomment').value=='' && document.getElementById('PerPage').value=='5'){ alert('Äëÿ ñìåíû ñòàòóñà çàêàçà íà \'Îòìåíåí\', îáÿçàòåëüíî, çàïîëíåíèå ïîëÿ \'Êîìåíòàðèé (ìåíåäæåðà)\''); return false;} else document.forms['SetStatus'].submit();\" ></div>-->"; |
1865 | // ñîõðàíèòü | 1865 | // ñîõðàíèòü |
1866 | - echo "<div id='records'><input type='submit' class='button-save' title='Ñîõðàíèòü' value='Ñîõðàíèòü' onclick=\"document.forms['edit_order'].submit();\"></div>"; | 1866 | + echo "<div id='records'><input type='submit' class='button-save' title='Ñîõðàíèòü' value='Ñîõðàíèòü'></div>"; // onclick=\"document.forms['edit_order'].submit();\" |
1867 | // ïå÷àòü | 1867 | // ïå÷àòü |
1868 | echo "<div id='records'><a href='/account/admin/orders.php?action=print&order_id=" . $order['order_id'] . "' target='_new' class='button-save'>Ïå÷àòü</a></div>"; | 1868 | echo "<div id='records'><a href='/account/admin/orders.php?action=print&order_id=" . $order['order_id'] . "' target='_new' class='button-save'>Ïå÷àòü</a></div>"; |
1869 | // âûõîä | 1869 | // âûõîä |
@@ -1899,22 +1899,22 @@ if (! isset ($_GET['action'])) | @@ -1899,22 +1899,22 @@ if (! isset ($_GET['action'])) | ||
1899 | 1899 | ||
1900 | echo ' | 1900 | echo ' |
1901 | <script language="JavaScript"> | 1901 | <script language="JavaScript"> |
1902 | - jQuery(document).ready(function() { | 1902 | + jQuery(document).ready(function() { |
1903 | 1903 | ||
1904 | - | ||
1905 | - jQuery(".input_status").click(function() { | ||
1906 | - $( "#status_box_"+$(this).attr("data-id") ).show(); | ||
1907 | - }) | ||
1908 | - | ||
1909 | - $( ".status_box ul li.name_city" ).click(function(){ | ||
1910 | - $("#input_status_"+$(this).attr("data-id")).val($(this).text()); | ||
1911 | - $( ".status_box" ).hide(); | ||
1912 | - }); | ||
1913 | - $( ".status_box ul li.other" ).click(function(){ | ||
1914 | - $("#input_status_"+$(this).attr("data-id")).val(""); | ||
1915 | - $( ".status_box" ).hide(); | ||
1916 | - $("#input_status_"+$(this).attr("data-id")).focus(); | ||
1917 | - }); | 1904 | + jQuery(".input_status").click(function() { |
1905 | + $( "#status_box_"+$(this).attr("data-id") ).show(); | ||
1906 | + }) | ||
1907 | + | ||
1908 | + $( ".status_box ul li.name_city" ).click(function(){ | ||
1909 | + $("#input_status_"+$(this).attr("data-id")).val($(this).text()); | ||
1910 | + $( ".status_box" ).hide(); | ||
1911 | + }); | ||
1912 | + $( ".status_box ul li.other" ).click(function(){ | ||
1913 | + $("#input_status_"+$(this).attr("data-id")).val(""); | ||
1914 | + $( ".status_box" ).hide(); | ||
1915 | + $("#input_status_"+$(this).attr("data-id")).focus(); | ||
1916 | + }); | ||
1917 | + | ||
1918 | }); | 1918 | }); |
1919 | </script>'; | 1919 | </script>'; |
1920 | 1920 |
css/account.css
@@ -435,7 +435,12 @@ | @@ -435,7 +435,12 @@ | ||
435 | fieldset#order-details b { display: block; margin: 5px;} | 435 | fieldset#order-details b { display: block; margin: 5px;} |
436 | 436 | ||
437 | #records .button-save, | 437 | #records .button-save, |
438 | - #records .button-edit { margin: 0 5px; padding: 5px 10px; font-size:14px;} | 438 | + #records .button-edit { |
439 | + margin: 0 5px; | ||
440 | + padding: 5px 10px; | ||
441 | + font-size:14px; | ||
442 | + cursor: pointer; | ||
443 | + } | ||
439 | div.pager-pages #show {float: left;padding: 10px 5px;} | 444 | div.pager-pages #show {float: left;padding: 10px 5px;} |
440 | div.orders #PerPage {width: 120px; background: none repeat scroll 0 0 #FFFFFF; | 445 | div.orders #PerPage {width: 120px; background: none repeat scroll 0 0 #FFFFFF; |
441 | border: 1px solid #DDDDDD; | 446 | border: 1px solid #DDDDDD; |