Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01

2018-05-02 13:49:17 +06:30
parent 52a6d13041 bf0dc3fecf
commit faa8b82295
33 changed files with 959 additions and 226 deletions
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -294,7 +294,7 @@
 							});

 						}else{
-							swal ( "Information" , result.message);
+							swal ( "Opps",result.message ,"warning" );
 						}
 					}
 				});
@@ -371,7 +371,7 @@
 								});

 							}else{
-								swal ( "Information" , result.message);
+								swal ( "Opps",result.message ,"warning" );
 							}
 						}
 					});