Fix item avatar rollover when hovering (#596)

Fix invoice right border (add colspan) (#529)
Fix form erorr handling (inherit in right order)
This commit is contained in:
jekkos
2016-06-01 08:12:10 +02:00
parent 998e9bbb8e
commit d2f3497d1e
19 changed files with 24 additions and 27 deletions

View File

@@ -120,6 +120,6 @@ $(document).ready(function()
email: "<?php echo $this->lang->line('common_email_invalid_format'); ?>",
account_number: "<?php echo $this->lang->line('customers_account_number_duplicate'); ?>"
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -47,6 +47,6 @@ $(document).ready(function()
{
file_path:"<?php echo $this->lang->line('common_import_full_path'); ?>"
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -224,6 +224,6 @@ $(document).ready(function()
},
email: "<?php echo $this->lang->line('common_email_invalid_format'); ?>"
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -121,6 +121,6 @@ $(document).ready(function()
number:"<?php echo $this->lang->line('giftcards_value'); ?>"
}
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -114,7 +114,7 @@ $(document).ready(function()
name:"<?php echo $this->lang->line('items_name_required'); ?>",
category:"<?php echo $this->lang->line('items_category_required'); ?>"
}
}, dialog_support.error));
}, form_support.error));
});
function delete_item_kit_row(link)

View File

@@ -455,7 +455,7 @@
number:"<?php echo $this->lang->line('items_tax_percent_number'); ?>"
}
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -229,6 +229,6 @@ $(document).ready(function()
}
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -47,6 +47,6 @@ $(document).ready(function()
{
file_path:"<?php echo $this->lang->line('common_import_full_path'); ?>"
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -46,14 +46,11 @@ $(document).ready(function()
stock_location: $("#stock_location").val(),
filters: $("#filters").val() || [""]
});
},
onLoadSuccess: function(response) {
$('a.rollover').imgPreview()
}
});
var handle_submit = table_support.handle_submit;
table_support.handle_submit = function() {
handle_submit.apply(this, arguments) && $('a.rollover').imgPreview();
};
});
</script>

View File

@@ -74,6 +74,6 @@ $(document).ready(function()
required:"<?php echo $this->lang->line('messages_message_required'); ?>"
}
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -69,7 +69,7 @@
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=c7aa3101ab"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=e29115a1fc" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=4c4f6f548e" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

View File

@@ -167,7 +167,7 @@ $(document).ready(function()
}
?>
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -203,7 +203,7 @@ $(document).ready(function()
{
invoice_number: '<?php echo $this->lang->line("sales_invoice_number_duplicate"); ?>'
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -90,7 +90,7 @@ if (isset($error_message))
<tr class="item-row">
<td></td>
<td class="item-name"><textarea cols="6"><?php echo $item['description']; ?></textarea></td>
<td style='text-align:center;'><textarea cols="6"><?php echo $item['serialnumber']; ?></textarea></td>
<td style='text-align:center;' colspan="4"><textarea cols="6"><?php echo $item['serialnumber']; ?></textarea></td>
</tr>
<?php
}

View File

@@ -75,7 +75,7 @@ $(document).ready(function()
last_name: "<?php echo $this->lang->line('common_last_name_required'); ?>",
email: "<?php echo $this->lang->line('common_email_invalid_format'); ?>"
}
}, dialog_support.error));
}, form_support.error));
});
</script>

View File

@@ -45351,7 +45351,7 @@ THE SOFTWARE.*/
}
};
form_support.handler = $.extend(form_support.error, {
form_support.handler = $.extend({
submitHandler: function(form) {
$(form).ajaxSubmit({
@@ -45372,7 +45372,7 @@ THE SOFTWARE.*/
{
}
});
}, form_support.error);
})(window.form_support = window.form_support || {}, jQuery);;(function($) {

View File

File diff suppressed because one or more lines are too long

View File

@@ -303,7 +303,7 @@
}
};
form_support.handler = $.extend(form_support.error, {
form_support.handler = $.extend({
submitHandler: function(form) {
$(form).ajaxSubmit({
@@ -324,6 +324,6 @@
{
}
});
}, form_support.error);
})(window.form_support = window.form_support || {}, jQuery);

View File

@@ -73,7 +73,7 @@
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=e29115a1fc" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=4c4f6f548e" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>