Pull from master

2018-05-03 09:31:36 +06:30
parent caa0180e8c
commit 45531453c7
47 changed files with 1042 additions and 263 deletions
--- a/app/views/origami/dinga/index.html.erb
+++ b/app/views/origami/dinga/index.html.erb
@@ -287,7 +287,7 @@
 							});

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

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