Skip to content

Commit

Permalink
Merge branch '1.x' into 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
glennjacobs authored Nov 19, 2024
2 parents 66a6d91 + d09621c commit 5f6cf61
Show file tree
Hide file tree
Showing 132 changed files with 5,589 additions and 112 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/fix-code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
with:
token: ${{ secrets.ACCESS_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
ref: ${{ github.head_ref }}
- name: Set up PHP
uses: shivammathur/setup-php@v2
Expand All @@ -26,5 +26,8 @@ jobs:
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_user_name: "GitHub Action"
commit_user_email: "[email protected]"
commit_author: "Author <[email protected]>"
commit_message: >
chore: fix code style
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<p align="center"><a href="https://lunarphp.io/" target="_blank"><picture><source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/lunarphp/art/main/lunar-logo-dark.svg"><img alt="Lunar" width="200" src="https://raw.githubusercontent.com/lunarphp/art/main/lunar-logo.svg"></picture></a></p>

> [!CAUTION]
> Version 1.x is currently in alpha release. We recommend this version for new projects, however, it is not feature-complete and therefore may not be deemed production-ready.
> Version 1.x is currently in beta release. We recommend this version for new projects, however, it is not feature-complete and therefore may not be deemed production-ready.

[Lunar](https://lunarphp.io) is a set of Laravel packages that bring functionality akin to Shopify and other e-commerce platforms to
Expand Down
4 changes: 2 additions & 2 deletions docs/admin/overview.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Introduction

::: danger Alpha Release
::: danger Beta Release
Although many Lunar sites have been launched using v1.x, you may not consider this version production-ready for your own
use and should exercise the same amount of caution as you would with any software in an alpha state. 🚀
use and should exercise the same amount of caution as you would with any software in an beta state. 🚀
:::

Lunar's admin panel is powered by Filament v3. It allows you to easily extend the admin panel to suit your project.
Expand Down
6 changes: 3 additions & 3 deletions docs/core/installation.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Installation

::: danger Alpha Release
::: danger Beta Release
Although many Lunar sites have been launched using v1.x, you may not consider this version production-ready for your own
use and should exercise the same amount of caution as you would with any software in an alpha state. 🚀
use and should exercise the same amount of caution as you would with any software in an beta state. 🚀
:::

## Requirements
Expand All @@ -20,7 +20,7 @@ use and should exercise the same amount of caution as you would with any softwar
### Composer Require Package

```sh
composer require lunarphp/lunar:"^1.0.0-alpha" -W
composer require lunarphp/lunar:"^1.0.0-beta" -W
```

::: tip
Expand Down
6 changes: 3 additions & 3 deletions docs/core/overview.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Welcome to Lunar!

::: danger Alpha Release
Although many Lunar sites have been launched using v1.x, you may not consider this version production-ready for your own
use and should exercise the same amount of caution as you would with any software in an alpha state. 🚀
::: danger Beta Release
Although many Lunar sites have been launched using v1.x, you may not consider this version production-ready for your own
use and should exercise the same amount of caution as you would with any software in an beta state. 🚀
:::

We are delighted you are considering Lunar for your project. We've spent a lot of time developing this package to bring headless e-commerce functionality to Laravel.
Expand Down
11 changes: 1 addition & 10 deletions docs/core/reference/carts.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,6 @@ foreach ($cart->shippingBreakdown->items as $shippingBreakdown) {
}


foreach ($cart->discountBreakdown as $discountBreakdown) {
$discountBreakdown->discount_id
foreach ($discountBreakdown->lines as $discountLine) {
$discountLine->quantity
$discountLine->line
}
$discountBreakdown->total->value
}

foreach ($cart->discountBreakdown as $discountBreakdown) {
$discountBreakdown->discount_id
foreach ($discountBreakdown->lines as $discountLine) {
Expand Down Expand Up @@ -270,7 +261,7 @@ When you call current, you have two options, you either return `null` if they
don't have a cart, or you want to create one straight away. By default, we do
not create them initially as this could lead to a ton of cart models being
created for no good reason. If you want to enable this functionality, you can
adjust the config in `lunar/cart.php`
adjust the config in `lunar/cart_session.php`

### Forgetting the cart
Forgetting the cart will remove it from the user session and also soft-delete
Expand Down
46 changes: 46 additions & 0 deletions packages/admin/resources/lang/es/actions.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

return [
'collections' => [
'create_root' => [
'label' => 'Crear colección raíz',
],
'create_child' => [
'label' => 'Crear colección secundaria',
],
'move' => [
'label' => 'Mover colección',
],
'delete' => [
'label' => 'Eliminar',
],
],
'orders' => [
'update_status' => [
'label' => 'Actualizar estado',
'wizard' => [
'step_one' => [
'label' => 'Estado',
],
'step_two' => [
'label' => 'Correos y notificaciones',
'no_mailers' => 'No hay correos disponibles para este estado.',
],
'step_three' => [
'label' => 'Previsualizar y guardar',
'no_mailers' => 'No se han seleccionado correos para la previsualización.',
],
],
'notification' => [
'label' => 'Estado del pedido actualizado',
],
'billing_email' => [
'label' => 'Correo de facturación',
],
'shipping_email' => [
'label' => 'Correo de envío',
],
],

],
];
29 changes: 29 additions & 0 deletions packages/admin/resources/lang/es/activity.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

return [

'label' => 'Actividad',

'plural_label' => 'Actividades',

'table' => [
'subject' => 'Asunto',
'description' => 'Descripción',
'log' => 'Registro',
'logged_at' => 'Registrado en',
'event' => 'Evento',
'logged_from' => 'Registrado desde',
'logged_until' => 'Registrado hasta',
],

'form' => [
'causer_type' => 'Tipo de causante',
'causer_id' => 'ID del causante',
'subject_type' => 'Tipo de asunto',
'subject_id' => 'ID del asunto',
'description' => 'Descripción',
'attributes' => 'Atributos',
'old' => 'Antiguo',
],

];
93 changes: 93 additions & 0 deletions packages/admin/resources/lang/es/address.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?php

return [

'label' => 'Dirección',

'plural_label' => 'Direcciones',

'table' => [
'title' => [
'label' => 'Título',
],
'first_name' => [
'label' => 'Nombre',
],
'last_name' => [
'label' => 'Apellido',
],
'company_name' => [
'label' => 'Nombre de la empresa',
],
'line_one' => [
'label' => 'Dirección',
],
'line_two' => [
'label' => 'Línea Dos',
],
'line_three' => [
'label' => 'Línea Tres',
],
'city' => [
'label' => 'Ciudad',
],
'country_id' => [
'label' => 'País',
],
'state' => [
'label' => 'Estado/Provincia',
],
'postcode' => [
'label' => 'Código postal',
],
'contact_email' => [
'label' => 'Correo de contacto',
],
'contact_phone' => [
'label' => 'Teléfono de contacto',
],
],

'form' => [
'title' => [
'label' => 'Título',
],
'first_name' => [
'label' => 'Nombre',
],
'last_name' => [
'label' => 'Apellido',
],
'company_name' => [
'label' => 'Nombre de la empresa',
],
'line_one' => [
'label' => 'Línea Uno',
],
'line_two' => [
'label' => 'Línea Dos',
],
'line_three' => [
'label' => 'Línea Tres',
],
'city' => [
'label' => 'Ciudad',
],
'country_id' => [
'label' => 'País',
],
'state' => [
'label' => 'Estado/Provincia',
],
'postcode' => [
'label' => 'Código postal',
],
'contact_email' => [
'label' => 'Correo de contacto',
],
'contact_phone' => [
'label' => 'Teléfono de contacto',
],
],

];
55 changes: 55 additions & 0 deletions packages/admin/resources/lang/es/attribute.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

return [

'label' => 'Atributo',

'plural_label' => 'Atributos',

'table' => [
'name' => [
'label' => 'Nombre',
],
'description' => [
'label' => 'Descripción',
],
'handle' => [
'label' => 'Identificador',
],
'type' => [
'label' => 'Tipo',
],
],

'form' => [
'attributable_type' => [
'label' => 'Tipo',
],
'name' => [
'label' => 'Nombre',
],
'description' => [
'label' => 'Descripción',
'helper' => 'Se usa para mostrar el texto de ayuda debajo de la entrada',
],
'handle' => [
'label' => 'Identificador',
],
'searchable' => [
'label' => 'Buscable',
],
'filterable' => [
'label' => 'Filtrable',
],
'required' => [
'label' => 'Requerido',
],
'type' => [
'label' => 'Tipo',
],
'validation_rules' => [
'label' => 'Reglas de validación',
'helper' => 'Reglas para el campo de atributo, ejemplo: min:1|max:10|...',
],
],
];
46 changes: 46 additions & 0 deletions packages/admin/resources/lang/es/attributegroup.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

return [

'label' => 'Grupo de Atributos',

'plural_label' => 'Grupos de Atributos',

'table' => [
'attributable_type' => [
'label' => 'Tipo',
],
'name' => [
'label' => 'Nombre',
],
'handle' => [
'label' => 'Identificador',
],
'position' => [
'label' => 'Posición',
],
],

'form' => [
'attributable_type' => [
'label' => 'Tipo',
],
'name' => [
'label' => 'Nombre',
],
'handle' => [
'label' => 'Identificador',
],
'position' => [
'label' => 'Posición',
],
],

'action' => [
'delete' => [
'notification' => [
'error_protected' => 'Este grupo de atributos no puede ser eliminado porque tiene atributos asociados.',
],
],
],
];
Loading

0 comments on commit 5f6cf61

Please sign in to comment.