Merge branch 'main' into mask-token

app/lib/commands/contacts/create.liquid

@@ -1,11 +1,14 @@
 {% liquid
     function object = 'commands/contacts/create/build', object: object
     function object = 'commands/contacts/create/check', object: object
-   
+
     if object.valid
       function object = 'commands/contacts/create/execute', object: object
-      function _ = 'modules/core/commands/events/publish', type: 'contact_created', object: object
+      assign event_object = '{}' | parse_json | hash_merge: id: object.id
+      hash_assign event_object["email"] = object.email
+      log event_object, type: 'event object'
+      function _ = 'modules/core/commands/events/publish', type: 'contact_created', object: event_object, delay: null, max_attempts: null
     endif
-   
+
     return object
-   %}
+   %}

app/lib/consumers/contact_created/notify_submitter.liquid

@@ -10,4 +10,4 @@
       "data": {}
     }
   {% endparse_json %}
-  {% function _ = 'modules/core/lib/commands/email/send', object: object %}
+  {% function _ = 'modules/core/commands/email/send', object: object %}

app/pos-modules.json

@@ -1,5 +1,5 @@
 {
   "modules": {
-    "core": "1.5.0"
+    "core": "1.5.2"
   }
 }

app/pos-modules.lock.json

@@ -1,5 +1,5 @@
 {
   "modules": {
-    "core": "1.5.0"
+    "core": "1.5.2"
   }
 }

app/views/pages/contacts/create.liquid

@@ -1,15 +1,12 @@
 ---
 method: post
 ---
-{% function contact = 'commands/contacts/create', object: context.params.contact %}
-{% if contact.valid %}
-  {% log contact, type: 'contact after valid' %}
-  {% assign event_object = '{}' | parse_json | hash_merge: id: contact.id %}
-  {% hash_assign event_object["email"] = contact.email %}
-  {% log event_object, type: 'event object' %}
-  {% function _ = 'modules/core/commands/events/publish', type: 'contact_created', object: event_object %}
-  {% redirect_to '/contacts/thanks' %}
-{% else %}
-  {% render 'contacts/form', contact: contact %}
-{% endif %}
-
+{% liquid
+  function contact = 'commands/contacts/create', object: context.params.contact
+  if contact.valid
+    log contact, type: 'contact after valid'
+    redirect_to '/contacts/thanks'
+  else
+    render 'contacts/form', contact: contact
+  endif
+%}

modules/core/public/lib/commands/statuses/create.liquid

@@ -10,6 +10,8 @@
     - timestamp (optional)
     - reference_schema (optional)
     - payload (optional)
+    - delay (optional)
+    - max_attempts (optional)
 {% endcomment %}
 {%  liquid
   function object = 'modules/core/commands/statuses/create/build', name: name, timestamp: timestamp, reference_id: reference_id, reference_schema: reference_schema, payload: payload, requester_id: requester_id
@@ -18,7 +20,7 @@
   if object.valid
     function object = 'modules/core/commands/execute', mutation_name: 'modules/core/statuses/create' object: object
     if object.valid
-      function _ = 'modules/core/commands/events/publish', type: 'status_created', object: object
+      function _ = 'modules/core/commands/events/publish', type: 'status_created', object: object, delay: delay, max_attempts: max_attempts
     endif
   else
     log object, 'showme STATUS-INVALID'

modules/core/public/lib/validations/equal.liquid

@@ -9,9 +9,9 @@
 
     if message == blank and key == blank
       if not_verbose
-        assign message = 'test.should.equal_not_verbose' | t
+        assign message = 'modules/core/validation.equal_not_verbose' | t
       else
-        assign message = 'test.should.equal' | t: given: given, expected: expected
+        assign message = 'modules/core/validation.equal' | t: given: given, expected: expected
       endif
     endif
     function c = 'modules/core/helpers/register_error', contract: c, field_name: field_name, message: message, key: key

modules/core/public/lib/validations/password_complexity.liquid

@@ -29,7 +29,7 @@
     endunless
   endif
 
-  function c = 'modules/core/validations/length', c: c, object: object, value: decoded_pw, field_name: field_name, maximum: maximum, minimum: minimum, message_minimum: key: 'modules/core/validation.too_short'
+  function c = 'modules/core/validations/length', c: c, object: object, value: decoded_pw, field_name: field_name, maximum: maximum, minimum: minimum, message_minimum: key: 'modules/core/validation.too_short', allow_blank: null
 
   return c
 %}

modules/core/public/translations/en/validation.yml

@@ -5,6 +5,8 @@ en:
     not_url: is not valid url
     blank: cannot be blank
     email: must be a valid email
+    equal: expected %{given} to equal %{expected}
+    equal_not_verbose: does not match
     array:
       not_included: '`%{value}` is not a valid value'
       not_unique: elements must be unique

modules/core/public/views/partials/lib/validations/equal.liquid

@@ -10,9 +10,9 @@
 
     if message == blank and key == blank
       if not_verbose
-        assign message = 'test.should.equal_not_verbose' | t
+        assign message = 'modules/core/validation.equal_not_verbose' | t
       else
-        assign message = 'test.should.equal' | t: given: given, expected: expected
+        assign message = 'modules/core/validation.equal' | t: given: given, expected: expected
       endif
     endif
     function c = 'modules/core/lib/helpers/register_error', contract: c, field_name: field_name, message: message, key: key

modules/core/public/views/partials/lib/validations/password_complexity.liquid

@@ -27,7 +27,7 @@
     endunless
   endif
 
-  function c = 'modules/core/lib/validations/length', c: c, object: object, value: decoded_pw, field_name: 'password', maximum: 256, minimum: 6, message_minimum: key: 'modules/core/validation.too_short'
+  function c = 'modules/core/lib/validations/length', c: c, object: object, value: decoded_pw, field_name: 'password', maximum: 256, minimum: 6, message_minimum: key: 'modules/core/validation.too_short', allow_blank: null
 
   return c
 %}

modules/core/template-values.json

@@ -2,6 +2,6 @@
   "name": "Pos Module Core",
   "machine_name": "core",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "dependencies": {}
 }