Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added multiple destinations #14

Merged
merged 2 commits into from
Jul 30, 2024
+125 −47
Merged

added multiple destinations #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb9ba81
added multiple destinations
brunoLombardo Jul 18, 2024
2bbc8b2
correction
brunoLombardo Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/assets/images/add.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/remove.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions app/assets/stylesheets/application.bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,11 @@ $utilities: map-merge(
pointer-events: none;
}

.img-destinations {
width: 30px;
height: 30px;
}

.shadow {
position: absolute;
width: 100%;
Expand Down Expand Up @@ -453,13 +458,19 @@ input[type="number"]::-webkit-outer-spin-button {
width: 100px;
height: 100px;
}

.img-destinations {
width: 15px;
height: 15px;
}


}

@include media-breakpoint-up(xl) {

.img-destinations {
width: 20px;
height: 20px;
}
}


Expand Down
32 changes: 32 additions & 0 deletions app/javascript/controllers/destinations_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { Controller } from "@hotwired/stimulus"

// Connects to data-controller="destinations"
export default class extends Controller {
static targets = ['template', 'form', 'errorRemove']
static classes = ['paddingWeb', 'paddingMobile', 'hide']


add() {
const newDestination = this.templateTarget.content.cloneNode(true)
const inputs = newDestination.querySelectorAll('input')
JorgeLeites marked this conversation as resolved.
Show resolved Hide resolved
const id = this.formTarget.childElementCount
inputs.forEach(input => {
input.setAttribute('name', input.getAttribute('name').replace('[template]', `[destinations_attributes][${id}]`))
input.setAttribute('id', input.getAttribute('id').replace('[template]', `destinations_attributes_${id}`))
input.value = ''
})
newDestination.querySelector('div').classList.add(this.paddingWebClass, this.paddingMobileClass)
this.formTarget.appendChild(newDestination)
this.errorRemoveTarget.classList.add(this.hideClass)
}

remove() {
if (this.formTarget.childElementCount > 1) {
this.formTarget.removeChild(this.formTarget.lastElementChild)
this.errorRemoveTarget.classList.add(this.hideClass)
} else {
this.errorRemoveTarget.classList.remove(this.hideClass)
}
}
}

3 changes: 3 additions & 0 deletions app/javascript/controllers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import { application } from "./application"
import AutoSubmitController from "./auto_submit_controller"
application.register("auto-submit", AutoSubmitController)

import DestinationsController from "./destinations_controller"
application.register("destinations", DestinationsController)

import DropDownController from "./dropDown_controller"
application.register("dropDown", DropDownController)

Expand Down
43 changes: 43 additions & 0 deletions app/views/purchases/_data_destination.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<div class="d-flex flex-column flex-lg-row column-gap-2 column-gap-lg-4" >
<div class="">
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.text_field :receiver, placeholder: 'Nombre y apellido', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1 pe-lg-2' %>
<% destination_form.object.errors[:receiver].each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.label :day, 'Fecha de entrega', class:'text-role-grey fs-sm-5 fs-lg-3 d-lg-none' %>
<%= destination_form.date_field :day, min: Date.today, class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1' %>
<% destination_form.object.errors[:day].each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.text_field :address, placeholder: 'Dirección de entrega', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1' %>
<% destination_form.object.errors[:address].each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
</div>
<div class="">
<div class="mb-5 mb-sm-6 mb-lg-2 ">
<%= destination_form.text_field :number, placeholder: 'Número de contacto', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1' %>
<% destination_form.object.errors[:number].each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.text_field :schedules, placeholder: 'Horarios de entrega', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1 pe-lg-2' %>
<% destination_form.object.errors[:schedules].each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="mb-3">
<%= destination_form.text_field :cost, placeholder: 'Costo de envío', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1' %>
<% destination_form.object.errors[:cost].each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
</div>
</div>
70 changes: 25 additions & 45 deletions app/views/purchases/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%= form_with model: @purchase do |form| %>
<%= form.select :customization_ids, @purchase.customization_ids,{}, multiple: true, style: "display: none;" %>
<%= form.hidden_field :amount, value: @purchase.amount %>
<div data-controller="purchase-process" data-purchase-process-hide-class='d-none' class="d-lg-flex justify-content-between">
<div data-controller="purchase-process" data-purchase-process-hide-class='d-none' class="d-lg-flex justify-content-between mb-lg-8">
<div data-purchase-process-target= "delivery" class="me-lg-15" >
<div class="d-flex flex-column top-0 position-lg-static position-absolute mt-md-16 mt-lg-0">
<div class="d-md-none">
Expand All @@ -18,51 +18,31 @@
</div>
<div class="d-flex flex-column">
<div class="d-flex flex-column mt-4 mt-sm-20 mt-md-22 mt-lg-0">
<%= form.fields_for :destinations do |destination_form| %>
<div class="d-flex flex-column flex-lg-row column-gap-2 column-gap-lg-4">
<div class="">
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.text_field :receiver, placeholder: 'Nombre y apellido', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1 pe-lg-2' %>
<% @purchase.errors.full_messages_for(:'destinations.receiver').each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.label :day, 'Fecha de entrega', class:'text-role-grey fs-sm-5 fs-lg-3 d-lg-none' %>
<%= destination_form.date_field :day, min: Date.today, class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1' %>
<% @purchase.errors.full_messages_for(:'destinations.day').each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.text_field :address, placeholder: 'Dirección de entrega', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1' %>
<% @purchase.errors.full_messages_for(:'destinations.address').each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
</div>
<div class="">
<div class="mb-5 mb-sm-6 mb-lg-2 ">
<%= destination_form.text_field :number, placeholder: 'Número de contacto', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1' %>
<% @purchase.errors.full_messages_for(:'destinations.number').each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.text_field :schedules, placeholder: 'Horarios de entrega', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1 pe-lg-2' %>
<% @purchase.errors.full_messages_for(:'destinations.schedules').each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="mb-5 mb-sm-6 mb-lg-2">
<%= destination_form.text_field :cost, placeholder: 'Costo de envío', class: 'border-0 border-bottom-solid outline-none text-role-grey bg-transparent grey-placeholder w-100 fs-sm-5 fs-lg-1' %>
<% @purchase.errors.full_messages_for(:'destinations.cost').each do |message| %>
<p class= "text-danger mb-0 fs-lg-1"><%= message %></p>
<% end %>
</div>
<div class="d-flex flex-column" data-controller = 'destinations'
data-destinations-hide-class= 'd-none'
data-destinations-padding-web-class= 'pt-lg-3' data-destinations-padding-mobile-class= 'pt-7' >
<%= form.fields_for :template, Destination.new() do |destination_form| %>
<template data-destinations-target = 'template'>
<%= render 'data_destination', purchase: @purchase, destination_form: destination_form %>
</template>
<% end%>
<div data-destinations-target= 'form' class="d-flex flex-column" >
<%= form.fields_for :destinations do |destination_form| %>
<%= render 'data_destination', purchase: @purchase, destination_form: destination_form %>
<% end %>
</div>
<div class="d-flex">
<div class="d-flex justify-content-center justify-content-lg-start column-gap-1 mb-2 mb-lg-0">
<button type= 'button' class= 'p-0 border-0 d-flex bg-transparent' data-action="click->destinations#add">
<%= image_tag('add.svg', class:'img-destinations')%>
</button>
<button type = 'button' class= 'p-0 border-0 d-flex bg-transparent' data-action="click->destinations#remove">
<%= image_tag('remove.svg', class:'img-destinations')%>
</button>
</div>
<p class= "fs-sm-5 fs-lg-1 mb-0 ms-3 text-danger d-none" data-destinations-target = "errorRemove">La entrega debe tener al menos un destinatario </p>
</div>
<% end %>
</div>
<div class="form-check form-switch d-flex mb-4 my-lg-2 ">
<%= form.check_box :suprise_delivery, class: 'form-check-input shadow-none outline-none me-3', role: 'switch'%>
<div class="d-flex flex-column">
Expand All @@ -89,7 +69,7 @@
</div>
<div class="d-flex flex-column mb-7 mb-lg-0">
<h4 class="fs-3 fs-sm-5 fw-medium mb-0">Si el envío rebota</h4>
<p class="fs-2 fs-sm-4 fw-light fs-lg-2">Cada re-entrega se considera un envío extra y el horario será coordinado por nuestro equipo con el destinatario.</p>
<p class="fs-2 fs-sm-4 fw-light fs-lg-2 mb-lg-0 mb-xl-1">Cada re-entrega se considera un envío extra y el horario será coordinado por nuestro equipo con el destinatario.</p>
<div class="d-flex">
<%= form.check_box :resend_delivery, class: 'me-2' %>
<%= form.label :resend_delivery, 'Intentar reenvío a la misma dirección.', class:'fs-1 fs-sm-3 fw-light fs-lg-1' %>
Expand Down
Loading